aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-02-11 14:44:00 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-03-10 10:41:02 -0400
commitbe70445c2d2b8403ad39a2cc8219ba0d16fb44c7 (patch)
tree2c61d9eca9fa69652965e44a1589218aac794291
parent80f7f92f94df0f08b30e1d72e9de9968b66a6ff8 (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_defconfig7
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
30CONFIG_AT91_SLOW_CLOCK=y 30CONFIG_AT91_SLOW_CLOCK=y
31# CONFIG_ARM_THUMB is not set 31# CONFIG_ARM_THUMB is not set
32CONFIG_AEABI=y 32CONFIG_AEABI=y
33CONFIG_LEDS=y
34CONFIG_LEDS_CPU=y
35CONFIG_ZBOOT_ROM_TEXT=0x0 33CONFIG_ZBOOT_ROM_TEXT=0x0
36CONFIG_ZBOOT_ROM_BSS=0x0 34CONFIG_ZBOOT_ROM_BSS=0x0
37CONFIG_ARM_APPENDED_DTB=y 35CONFIG_ARM_APPENDED_DTB=y
38CONFIG_ARM_ATAG_DTB_COMPAT=y 36CONFIG_ARM_ATAG_DTB_COMPAT=y
39CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" 37CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
40CONFIG_AUTO_ZRELADDR=y 38CONFIG_AUTO_ZRELADDR=y
41CONFIG_FPE_NWFPE=y
42CONFIG_NET=y 39CONFIG_NET=y
43CONFIG_PACKET=y 40CONFIG_PACKET=y
44CONFIG_UNIX=y 41CONFIG_UNIX=y
@@ -57,7 +54,6 @@ CONFIG_DEVTMPFS_MOUNT=y
57CONFIG_MTD=y 54CONFIG_MTD=y
58CONFIG_MTD_CMDLINE_PARTS=y 55CONFIG_MTD_CMDLINE_PARTS=y
59CONFIG_MTD_OF_PARTS=y 56CONFIG_MTD_OF_PARTS=y
60CONFIG_MTD_CHAR=y
61CONFIG_MTD_BLOCK=y 57CONFIG_MTD_BLOCK=y
62CONFIG_MTD_DATAFLASH=y 58CONFIG_MTD_DATAFLASH=y
63CONFIG_MTD_NAND=y 59CONFIG_MTD_NAND=y
@@ -65,7 +61,6 @@ CONFIG_MTD_NAND_ATMEL=y
65CONFIG_BLK_DEV_LOOP=y 61CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_RAM=y 62CONFIG_BLK_DEV_RAM=y
67CONFIG_BLK_DEV_RAM_SIZE=8192 63CONFIG_BLK_DEV_RAM_SIZE=8192
68CONFIG_MISC_DEVICES=y
69CONFIG_EEPROM_AT25=y 64CONFIG_EEPROM_AT25=y
70CONFIG_SCSI=y 65CONFIG_SCSI=y
71CONFIG_BLK_DEV_SD=y 66CONFIG_BLK_DEV_SD=y
@@ -112,8 +107,6 @@ CONFIG_SND_PCM_OSS=y
112CONFIG_SND_SEQUENCER_OSS=y 107CONFIG_SND_SEQUENCER_OSS=y
113# CONFIG_SND_VERBOSE_PROCFS is not set 108# CONFIG_SND_VERBOSE_PROCFS is not set
114CONFIG_USB=y 109CONFIG_USB=y
115CONFIG_USB_DEVICEFS=y
116# CONFIG_USB_DEVICE_CLASS is not set
117CONFIG_USB_MON=y 110CONFIG_USB_MON=y
118CONFIG_USB_OHCI_HCD=y 111CONFIG_USB_OHCI_HCD=y
119CONFIG_USB_STORAGE=y 112CONFIG_USB_STORAGE=y