diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-02-11 14:44:00 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-03-10 10:41:02 -0400 |
commit | be70445c2d2b8403ad39a2cc8219ba0d16fb44c7 (patch) | |
tree | 2c61d9eca9fa69652965e44a1589218aac794291 | |
parent | 80f7f92f94df0f08b30e1d72e9de9968b66a6ff8 (diff) |
ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfig
A few configuration symbols are deprecated and disappeared a few versions ago,
remove them.
CONFIG_FPE_NWFPE depends on OABI_COMPAT which was not selected.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/configs/at91sam9260_9g20_defconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig index 2cd832918e9c..912dedb40e2e 100644 --- a/arch/arm/configs/at91sam9260_9g20_defconfig +++ b/arch/arm/configs/at91sam9260_9g20_defconfig | |||
@@ -30,15 +30,12 @@ CONFIG_MACH_AT91SAM9_DT=y | |||
30 | CONFIG_AT91_SLOW_CLOCK=y | 30 | CONFIG_AT91_SLOW_CLOCK=y |
31 | # CONFIG_ARM_THUMB is not set | 31 | # CONFIG_ARM_THUMB is not set |
32 | CONFIG_AEABI=y | 32 | CONFIG_AEABI=y |
33 | CONFIG_LEDS=y | ||
34 | CONFIG_LEDS_CPU=y | ||
35 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 33 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
36 | CONFIG_ZBOOT_ROM_BSS=0x0 | 34 | CONFIG_ZBOOT_ROM_BSS=0x0 |
37 | CONFIG_ARM_APPENDED_DTB=y | 35 | CONFIG_ARM_APPENDED_DTB=y |
38 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 36 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
39 | CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" | 37 | CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" |
40 | CONFIG_AUTO_ZRELADDR=y | 38 | CONFIG_AUTO_ZRELADDR=y |
41 | CONFIG_FPE_NWFPE=y | ||
42 | CONFIG_NET=y | 39 | CONFIG_NET=y |
43 | CONFIG_PACKET=y | 40 | CONFIG_PACKET=y |
44 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
@@ -57,7 +54,6 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
57 | CONFIG_MTD=y | 54 | CONFIG_MTD=y |
58 | CONFIG_MTD_CMDLINE_PARTS=y | 55 | CONFIG_MTD_CMDLINE_PARTS=y |
59 | CONFIG_MTD_OF_PARTS=y | 56 | CONFIG_MTD_OF_PARTS=y |
60 | CONFIG_MTD_CHAR=y | ||
61 | CONFIG_MTD_BLOCK=y | 57 | CONFIG_MTD_BLOCK=y |
62 | CONFIG_MTD_DATAFLASH=y | 58 | CONFIG_MTD_DATAFLASH=y |
63 | CONFIG_MTD_NAND=y | 59 | CONFIG_MTD_NAND=y |
@@ -65,7 +61,6 @@ CONFIG_MTD_NAND_ATMEL=y | |||
65 | CONFIG_BLK_DEV_LOOP=y | 61 | CONFIG_BLK_DEV_LOOP=y |
66 | CONFIG_BLK_DEV_RAM=y | 62 | CONFIG_BLK_DEV_RAM=y |
67 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 63 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
68 | CONFIG_MISC_DEVICES=y | ||
69 | CONFIG_EEPROM_AT25=y | 64 | CONFIG_EEPROM_AT25=y |
70 | CONFIG_SCSI=y | 65 | CONFIG_SCSI=y |
71 | CONFIG_BLK_DEV_SD=y | 66 | CONFIG_BLK_DEV_SD=y |
@@ -112,8 +107,6 @@ CONFIG_SND_PCM_OSS=y | |||
112 | CONFIG_SND_SEQUENCER_OSS=y | 107 | CONFIG_SND_SEQUENCER_OSS=y |
113 | # CONFIG_SND_VERBOSE_PROCFS is not set | 108 | # CONFIG_SND_VERBOSE_PROCFS is not set |
114 | CONFIG_USB=y | 109 | CONFIG_USB=y |
115 | CONFIG_USB_DEVICEFS=y | ||
116 | # CONFIG_USB_DEVICE_CLASS is not set | ||
117 | CONFIG_USB_MON=y | 110 | CONFIG_USB_MON=y |
118 | CONFIG_USB_OHCI_HCD=y | 111 | CONFIG_USB_OHCI_HCD=y |
119 | CONFIG_USB_STORAGE=y | 112 | CONFIG_USB_STORAGE=y |