aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-01-13 06:18:32 -0500
committerHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-01-13 14:41:15 -0500
commitc975ffadd144e8e99e83e8f80ee94efce4f170b5 (patch)
tree6a8b96f93e4cc5466f9f7e26090bb75c226e6ee2
parent1e2de47cddc70ae973cf468e2f2954b4ae80f4e3 (diff)
avr32: update default configuration files for Atmel boards
This patch adjusts some values to make the default configuration for Atmel boards more similar, and adds missing values to enable required functions. Also remove defined symbols for functions not in use. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
-rw-r--r--arch/avr32/configs/atngw100_defconfig21
-rw-r--r--arch/avr32/configs/atngw100_evklcd100_defconfig15
-rw-r--r--arch/avr32/configs/atngw100_evklcd101_defconfig15
-rw-r--r--arch/avr32/configs/atngw100mkii_defconfig20
-rw-r--r--arch/avr32/configs/atngw100mkii_evklcd100_defconfig15
-rw-r--r--arch/avr32/configs/atngw100mkii_evklcd101_defconfig15
-rw-r--r--arch/avr32/configs/atstk1002_defconfig23
-rw-r--r--arch/avr32/configs/atstk1003_defconfig39
-rw-r--r--arch/avr32/configs/atstk1004_defconfig109
-rw-r--r--arch/avr32/configs/atstk1006_defconfig21
10 files changed, 184 insertions, 109 deletions
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index fe9525e359ad..6f9ca56de1f6 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -29,6 +26,7 @@ CONFIG_CPU_FREQ=y
29CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 26CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
30CONFIG_CPU_FREQ_GOV_USERSPACE=y 27CONFIG_CPU_FREQ_GOV_USERSPACE=y
31CONFIG_CPU_FREQ_AT32AP=y 28CONFIG_CPU_FREQ_AT32AP=y
29CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
32CONFIG_NET=y 30CONFIG_NET=y
33CONFIG_PACKET=y 31CONFIG_PACKET=y
34CONFIG_UNIX=y 32CONFIG_UNIX=y
@@ -72,8 +70,8 @@ CONFIG_MTD_UBI=y
72CONFIG_BLK_DEV_LOOP=m 70CONFIG_BLK_DEV_LOOP=m
73CONFIG_BLK_DEV_NBD=m 71CONFIG_BLK_DEV_NBD=m
74CONFIG_BLK_DEV_RAM=m 72CONFIG_BLK_DEV_RAM=m
73CONFIG_MISC_DEVICES=y
75CONFIG_ATMEL_TCLIB=y 74CONFIG_ATMEL_TCLIB=y
76CONFIG_EEPROM_AT24=m
77CONFIG_NETDEVICES=y 75CONFIG_NETDEVICES=y
78CONFIG_TUN=m 76CONFIG_TUN=m
79CONFIG_NET_ETHERNET=y 77CONFIG_NET_ETHERNET=y
@@ -106,6 +104,7 @@ CONFIG_GPIO_SYSFS=y
106CONFIG_WATCHDOG=y 104CONFIG_WATCHDOG=y
107CONFIG_AT32AP700X_WDT=y 105CONFIG_AT32AP700X_WDT=y
108CONFIG_USB_GADGET=y 106CONFIG_USB_GADGET=y
107CONFIG_USB_GADGET_VBUS_DRAW=350
109CONFIG_USB_ZERO=m 108CONFIG_USB_ZERO=m
110CONFIG_USB_ETH=m 109CONFIG_USB_ETH=m
111CONFIG_USB_GADGETFS=m 110CONFIG_USB_GADGETFS=m
@@ -115,14 +114,12 @@ CONFIG_USB_CDC_COMPOSITE=m
115CONFIG_MMC=y 114CONFIG_MMC=y
116CONFIG_MMC_TEST=m 115CONFIG_MMC_TEST=m
117CONFIG_MMC_ATMELMCI=y 116CONFIG_MMC_ATMELMCI=y
118CONFIG_MMC_SPI=m
119CONFIG_NEW_LEDS=y 117CONFIG_NEW_LEDS=y
120CONFIG_LEDS_CLASS=y 118CONFIG_LEDS_CLASS=y
121CONFIG_LEDS_GPIO=y 119CONFIG_LEDS_GPIO=y
122CONFIG_LEDS_TRIGGERS=y 120CONFIG_LEDS_TRIGGERS=y
123CONFIG_LEDS_TRIGGER_TIMER=y 121CONFIG_LEDS_TRIGGER_TIMER=y
124CONFIG_LEDS_TRIGGER_HEARTBEAT=y 122CONFIG_LEDS_TRIGGER_HEARTBEAT=y
125CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
126CONFIG_RTC_CLASS=y 123CONFIG_RTC_CLASS=y
127CONFIG_RTC_DRV_AT32AP700X=y 124CONFIG_RTC_DRV_AT32AP700X=y
128CONFIG_DMADEVICES=y 125CONFIG_DMADEVICES=y
@@ -130,21 +127,23 @@ CONFIG_EXT2_FS=y
130CONFIG_EXT3_FS=y 127CONFIG_EXT3_FS=y
131# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 128# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
132# CONFIG_EXT3_FS_XATTR is not set 129# CONFIG_EXT3_FS_XATTR is not set
130CONFIG_EXT4_FS=y
131# CONFIG_EXT4_FS_XATTR is not set
133# CONFIG_DNOTIFY is not set 132# CONFIG_DNOTIFY is not set
134CONFIG_FUSE_FS=m 133CONFIG_FUSE_FS=m
135CONFIG_MSDOS_FS=m 134CONFIG_MSDOS_FS=m
136CONFIG_VFAT_FS=m 135CONFIG_VFAT_FS=m
137CONFIG_FAT_DEFAULT_CODEPAGE=850 136CONFIG_FAT_DEFAULT_CODEPAGE=850
137CONFIG_PROC_KCORE=y
138CONFIG_TMPFS=y 138CONFIG_TMPFS=y
139CONFIG_CONFIGFS_FS=m 139CONFIG_CONFIGFS_FS=y
140CONFIG_JFFS2_FS=y 140CONFIG_JFFS2_FS=y
141CONFIG_UFS_FS=y 141CONFIG_UBIFS_FS=y
142CONFIG_NFS_FS=y 142CONFIG_NFS_FS=y
143CONFIG_NFS_V3=y 143CONFIG_NFS_V3=y
144CONFIG_ROOT_NFS=y 144CONFIG_ROOT_NFS=y
145CONFIG_NFSD=m 145CONFIG_NFSD=m
146CONFIG_NFSD_V3=y 146CONFIG_NFSD_V3=y
147CONFIG_SMB_FS=m
148CONFIG_CIFS=m 147CONFIG_CIFS=m
149CONFIG_NLS_CODEPAGE_437=m 148CONFIG_NLS_CODEPAGE_437=m
150CONFIG_NLS_CODEPAGE_850=m 149CONFIG_NLS_CODEPAGE_850=m
@@ -155,5 +154,3 @@ CONFIG_DEBUG_FS=y
155CONFIG_DEBUG_KERNEL=y 154CONFIG_DEBUG_KERNEL=y
156CONFIG_DETECT_HUNG_TASK=y 155CONFIG_DETECT_HUNG_TASK=y
157CONFIG_FRAME_POINTER=y 156CONFIG_FRAME_POINTER=y
158# CONFIG_RCU_CPU_STALL_DETECTOR is not set
159CONFIG_CRYPTO_PCBC=m
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index 8dae90cbe8a3..7eece0af34c9 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -31,6 +28,7 @@ CONFIG_CPU_FREQ=y
31CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 28CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
32CONFIG_CPU_FREQ_GOV_USERSPACE=y 29CONFIG_CPU_FREQ_GOV_USERSPACE=y
33CONFIG_CPU_FREQ_AT32AP=y 30CONFIG_CPU_FREQ_AT32AP=y
31CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
34CONFIG_NET=y 32CONFIG_NET=y
35CONFIG_PACKET=y 33CONFIG_PACKET=y
36CONFIG_UNIX=y 34CONFIG_UNIX=y
@@ -74,8 +72,10 @@ CONFIG_MTD_UBI=y
74CONFIG_BLK_DEV_LOOP=m 72CONFIG_BLK_DEV_LOOP=m
75CONFIG_BLK_DEV_NBD=m 73CONFIG_BLK_DEV_NBD=m
76CONFIG_BLK_DEV_RAM=m 74CONFIG_BLK_DEV_RAM=m
75CONFIG_MISC_DEVICES=y
77CONFIG_ATMEL_TCLIB=y 76CONFIG_ATMEL_TCLIB=y
78CONFIG_NETDEVICES=y 77CONFIG_NETDEVICES=y
78CONFIG_TUN=m
79CONFIG_NET_ETHERNET=y 79CONFIG_NET_ETHERNET=y
80CONFIG_MACB=y 80CONFIG_MACB=y
81# CONFIG_NETDEV_1000 is not set 81# CONFIG_NETDEV_1000 is not set
@@ -104,6 +104,7 @@ CONFIG_I2C_GPIO=m
104CONFIG_SPI=y 104CONFIG_SPI=y
105CONFIG_SPI_ATMEL=y 105CONFIG_SPI_ATMEL=y
106CONFIG_SPI_SPIDEV=m 106CONFIG_SPI_SPIDEV=m
107CONFIG_GPIO_SYSFS=y
107# CONFIG_HWMON is not set 108# CONFIG_HWMON is not set
108CONFIG_WATCHDOG=y 109CONFIG_WATCHDOG=y
109CONFIG_AT32AP700X_WDT=y 110CONFIG_AT32AP700X_WDT=y
@@ -127,6 +128,7 @@ CONFIG_USB_FILE_STORAGE=m
127CONFIG_USB_G_SERIAL=m 128CONFIG_USB_G_SERIAL=m
128CONFIG_USB_CDC_COMPOSITE=m 129CONFIG_USB_CDC_COMPOSITE=m
129CONFIG_MMC=y 130CONFIG_MMC=y
131CONFIG_MMC_TEST=m
130CONFIG_MMC_ATMELMCI=y 132CONFIG_MMC_ATMELMCI=y
131CONFIG_NEW_LEDS=y 133CONFIG_NEW_LEDS=y
132CONFIG_LEDS_CLASS=y 134CONFIG_LEDS_CLASS=y
@@ -141,11 +143,14 @@ CONFIG_EXT2_FS=y
141CONFIG_EXT3_FS=y 143CONFIG_EXT3_FS=y
142# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 144# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
143# CONFIG_EXT3_FS_XATTR is not set 145# CONFIG_EXT3_FS_XATTR is not set
146CONFIG_EXT4_FS=y
147# CONFIG_EXT4_FS_XATTR is not set
144# CONFIG_DNOTIFY is not set 148# CONFIG_DNOTIFY is not set
145CONFIG_FUSE_FS=m 149CONFIG_FUSE_FS=m
146CONFIG_MSDOS_FS=m 150CONFIG_MSDOS_FS=m
147CONFIG_VFAT_FS=m 151CONFIG_VFAT_FS=m
148CONFIG_FAT_DEFAULT_CODEPAGE=850 152CONFIG_FAT_DEFAULT_CODEPAGE=850
153CONFIG_PROC_KCORE=y
149CONFIG_TMPFS=y 154CONFIG_TMPFS=y
150CONFIG_CONFIGFS_FS=y 155CONFIG_CONFIGFS_FS=y
151CONFIG_JFFS2_FS=y 156CONFIG_JFFS2_FS=y
@@ -155,7 +160,6 @@ CONFIG_NFS_V3=y
155CONFIG_ROOT_NFS=y 160CONFIG_ROOT_NFS=y
156CONFIG_NFSD=m 161CONFIG_NFSD=m
157CONFIG_NFSD_V3=y 162CONFIG_NFSD_V3=y
158CONFIG_SMB_FS=m
159CONFIG_CIFS=m 163CONFIG_CIFS=m
160CONFIG_NLS_CODEPAGE_437=m 164CONFIG_NLS_CODEPAGE_437=m
161CONFIG_NLS_CODEPAGE_850=m 165CONFIG_NLS_CODEPAGE_850=m
@@ -166,4 +170,3 @@ CONFIG_DEBUG_FS=y
166CONFIG_DEBUG_KERNEL=y 170CONFIG_DEBUG_KERNEL=y
167CONFIG_DETECT_HUNG_TASK=y 171CONFIG_DETECT_HUNG_TASK=y
168CONFIG_FRAME_POINTER=y 172CONFIG_FRAME_POINTER=y
169# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index 985f4b937923..387eb9d6e423 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -30,6 +27,7 @@ CONFIG_CPU_FREQ=y
30CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 27CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
31CONFIG_CPU_FREQ_GOV_USERSPACE=y 28CONFIG_CPU_FREQ_GOV_USERSPACE=y
32CONFIG_CPU_FREQ_AT32AP=y 29CONFIG_CPU_FREQ_AT32AP=y
30CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
33CONFIG_NET=y 31CONFIG_NET=y
34CONFIG_PACKET=y 32CONFIG_PACKET=y
35CONFIG_UNIX=y 33CONFIG_UNIX=y
@@ -73,8 +71,10 @@ CONFIG_MTD_UBI=y
73CONFIG_BLK_DEV_LOOP=m 71CONFIG_BLK_DEV_LOOP=m
74CONFIG_BLK_DEV_NBD=m 72CONFIG_BLK_DEV_NBD=m
75CONFIG_BLK_DEV_RAM=m 73CONFIG_BLK_DEV_RAM=m
74CONFIG_MISC_DEVICES=y
76CONFIG_ATMEL_TCLIB=y 75CONFIG_ATMEL_TCLIB=y
77CONFIG_NETDEVICES=y 76CONFIG_NETDEVICES=y
77CONFIG_TUN=m
78CONFIG_NET_ETHERNET=y 78CONFIG_NET_ETHERNET=y
79CONFIG_MACB=y 79CONFIG_MACB=y
80# CONFIG_NETDEV_1000 is not set 80# CONFIG_NETDEV_1000 is not set
@@ -103,6 +103,7 @@ CONFIG_I2C_GPIO=m
103CONFIG_SPI=y 103CONFIG_SPI=y
104CONFIG_SPI_ATMEL=y 104CONFIG_SPI_ATMEL=y
105CONFIG_SPI_SPIDEV=m 105CONFIG_SPI_SPIDEV=m
106CONFIG_GPIO_SYSFS=y
106# CONFIG_HWMON is not set 107# CONFIG_HWMON is not set
107CONFIG_WATCHDOG=y 108CONFIG_WATCHDOG=y
108CONFIG_AT32AP700X_WDT=y 109CONFIG_AT32AP700X_WDT=y
@@ -126,6 +127,7 @@ CONFIG_USB_FILE_STORAGE=m
126CONFIG_USB_G_SERIAL=m 127CONFIG_USB_G_SERIAL=m
127CONFIG_USB_CDC_COMPOSITE=m 128CONFIG_USB_CDC_COMPOSITE=m
128CONFIG_MMC=y 129CONFIG_MMC=y
130CONFIG_MMC_TEST=m
129CONFIG_MMC_ATMELMCI=y 131CONFIG_MMC_ATMELMCI=y
130CONFIG_NEW_LEDS=y 132CONFIG_NEW_LEDS=y
131CONFIG_LEDS_CLASS=y 133CONFIG_LEDS_CLASS=y
@@ -140,11 +142,14 @@ CONFIG_EXT2_FS=y
140CONFIG_EXT3_FS=y 142CONFIG_EXT3_FS=y
141# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 143# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
142# CONFIG_EXT3_FS_XATTR is not set 144# CONFIG_EXT3_FS_XATTR is not set
145CONFIG_EXT4_FS=y
146# CONFIG_EXT4_FS_XATTR is not set
143# CONFIG_DNOTIFY is not set 147# CONFIG_DNOTIFY is not set
144CONFIG_FUSE_FS=m 148CONFIG_FUSE_FS=m
145CONFIG_MSDOS_FS=m 149CONFIG_MSDOS_FS=m
146CONFIG_VFAT_FS=m 150CONFIG_VFAT_FS=m
147CONFIG_FAT_DEFAULT_CODEPAGE=850 151CONFIG_FAT_DEFAULT_CODEPAGE=850
152CONFIG_PROC_KCORE=y
148CONFIG_TMPFS=y 153CONFIG_TMPFS=y
149CONFIG_CONFIGFS_FS=y 154CONFIG_CONFIGFS_FS=y
150CONFIG_JFFS2_FS=y 155CONFIG_JFFS2_FS=y
@@ -154,7 +159,6 @@ CONFIG_NFS_V3=y
154CONFIG_ROOT_NFS=y 159CONFIG_ROOT_NFS=y
155CONFIG_NFSD=m 160CONFIG_NFSD=m
156CONFIG_NFSD_V3=y 161CONFIG_NFSD_V3=y
157CONFIG_SMB_FS=m
158CONFIG_CIFS=m 162CONFIG_CIFS=m
159CONFIG_NLS_CODEPAGE_437=m 163CONFIG_NLS_CODEPAGE_437=m
160CONFIG_NLS_CODEPAGE_850=m 164CONFIG_NLS_CODEPAGE_850=m
@@ -165,4 +169,3 @@ CONFIG_DEBUG_FS=y
165CONFIG_DEBUG_KERNEL=y 169CONFIG_DEBUG_KERNEL=y
166CONFIG_DETECT_HUNG_TASK=y 170CONFIG_DETECT_HUNG_TASK=y
167CONFIG_FRAME_POINTER=y 171CONFIG_FRAME_POINTER=y
168# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig
index e5d029595bf2..f0fe237133a9 100644
--- a/arch/avr32/configs/atngw100mkii_defconfig
+++ b/arch/avr32/configs/atngw100mkii_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -29,6 +26,7 @@ CONFIG_CPU_FREQ=y
29CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 26CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
30CONFIG_CPU_FREQ_GOV_USERSPACE=y 27CONFIG_CPU_FREQ_GOV_USERSPACE=y
31CONFIG_CPU_FREQ_AT32AP=y 28CONFIG_CPU_FREQ_AT32AP=y
29CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
32CONFIG_NET=y 30CONFIG_NET=y
33CONFIG_PACKET=y 31CONFIG_PACKET=y
34CONFIG_UNIX=y 32CONFIG_UNIX=y
@@ -74,6 +72,7 @@ CONFIG_MTD_UBI=y
74CONFIG_BLK_DEV_LOOP=m 72CONFIG_BLK_DEV_LOOP=m
75CONFIG_BLK_DEV_NBD=m 73CONFIG_BLK_DEV_NBD=m
76CONFIG_BLK_DEV_RAM=m 74CONFIG_BLK_DEV_RAM=m
75CONFIG_MISC_DEVICES=y
77CONFIG_ATMEL_TCLIB=y 76CONFIG_ATMEL_TCLIB=y
78CONFIG_NETDEVICES=y 77CONFIG_NETDEVICES=y
79CONFIG_TUN=m 78CONFIG_TUN=m
@@ -107,6 +106,7 @@ CONFIG_GPIO_SYSFS=y
107CONFIG_WATCHDOG=y 106CONFIG_WATCHDOG=y
108CONFIG_AT32AP700X_WDT=y 107CONFIG_AT32AP700X_WDT=y
109CONFIG_USB_GADGET=y 108CONFIG_USB_GADGET=y
109CONFIG_USB_GADGET_VBUS_DRAW=350
110CONFIG_USB_ZERO=m 110CONFIG_USB_ZERO=m
111CONFIG_USB_ETH=m 111CONFIG_USB_ETH=m
112CONFIG_USB_GADGETFS=m 112CONFIG_USB_GADGETFS=m
@@ -116,14 +116,12 @@ CONFIG_USB_CDC_COMPOSITE=m
116CONFIG_MMC=y 116CONFIG_MMC=y
117CONFIG_MMC_TEST=m 117CONFIG_MMC_TEST=m
118CONFIG_MMC_ATMELMCI=y 118CONFIG_MMC_ATMELMCI=y
119CONFIG_MMC_SPI=m
120CONFIG_NEW_LEDS=y 119CONFIG_NEW_LEDS=y
121CONFIG_LEDS_CLASS=y 120CONFIG_LEDS_CLASS=y
122CONFIG_LEDS_GPIO=y 121CONFIG_LEDS_GPIO=y
123CONFIG_LEDS_TRIGGERS=y 122CONFIG_LEDS_TRIGGERS=y
124CONFIG_LEDS_TRIGGER_TIMER=y 123CONFIG_LEDS_TRIGGER_TIMER=y
125CONFIG_LEDS_TRIGGER_HEARTBEAT=y 124CONFIG_LEDS_TRIGGER_HEARTBEAT=y
126CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
127CONFIG_RTC_CLASS=y 125CONFIG_RTC_CLASS=y
128CONFIG_RTC_DRV_AT32AP700X=y 126CONFIG_RTC_DRV_AT32AP700X=y
129CONFIG_DMADEVICES=y 127CONFIG_DMADEVICES=y
@@ -131,21 +129,23 @@ CONFIG_EXT2_FS=y
131CONFIG_EXT3_FS=y 129CONFIG_EXT3_FS=y
132# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 130# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
133# CONFIG_EXT3_FS_XATTR is not set 131# CONFIG_EXT3_FS_XATTR is not set
132CONFIG_EXT4_FS=y
133# CONFIG_EXT4_FS_XATTR is not set
134# CONFIG_DNOTIFY is not set 134# CONFIG_DNOTIFY is not set
135CONFIG_FUSE_FS=m 135CONFIG_FUSE_FS=m
136CONFIG_MSDOS_FS=m 136CONFIG_MSDOS_FS=m
137CONFIG_VFAT_FS=m 137CONFIG_VFAT_FS=m
138CONFIG_FAT_DEFAULT_CODEPAGE=850 138CONFIG_FAT_DEFAULT_CODEPAGE=850
139CONFIG_PROC_KCORE=y
139CONFIG_TMPFS=y 140CONFIG_TMPFS=y
140CONFIG_CONFIGFS_FS=m 141CONFIG_CONFIGFS_FS=y
141CONFIG_JFFS2_FS=y 142CONFIG_JFFS2_FS=y
142CONFIG_UFS_FS=y 143CONFIG_UBIFS_FS=y
143CONFIG_NFS_FS=y 144CONFIG_NFS_FS=y
144CONFIG_NFS_V3=y 145CONFIG_NFS_V3=y
145CONFIG_ROOT_NFS=y 146CONFIG_ROOT_NFS=y
146CONFIG_NFSD=m 147CONFIG_NFSD=m
147CONFIG_NFSD_V3=y 148CONFIG_NFSD_V3=y
148CONFIG_SMB_FS=m
149CONFIG_CIFS=m 149CONFIG_CIFS=m
150CONFIG_NLS_CODEPAGE_437=m 150CONFIG_NLS_CODEPAGE_437=m
151CONFIG_NLS_CODEPAGE_850=m 151CONFIG_NLS_CODEPAGE_850=m
@@ -156,5 +156,3 @@ CONFIG_DEBUG_FS=y
156CONFIG_DEBUG_KERNEL=y 156CONFIG_DEBUG_KERNEL=y
157CONFIG_DETECT_HUNG_TASK=y 157CONFIG_DETECT_HUNG_TASK=y
158CONFIG_FRAME_POINTER=y 158CONFIG_FRAME_POINTER=y
159# CONFIG_RCU_CPU_STALL_DETECTOR is not set
160CONFIG_CRYPTO_PCBC=m
diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
index 93fee4ac3748..e4a7c1dc8380 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -32,6 +29,7 @@ CONFIG_CPU_FREQ=y
32CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 29CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
33CONFIG_CPU_FREQ_GOV_USERSPACE=y 30CONFIG_CPU_FREQ_GOV_USERSPACE=y
34CONFIG_CPU_FREQ_AT32AP=y 31CONFIG_CPU_FREQ_AT32AP=y
32CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
35CONFIG_NET=y 33CONFIG_NET=y
36CONFIG_PACKET=y 34CONFIG_PACKET=y
37CONFIG_UNIX=y 35CONFIG_UNIX=y
@@ -77,8 +75,10 @@ CONFIG_MTD_UBI=y
77CONFIG_BLK_DEV_LOOP=m 75CONFIG_BLK_DEV_LOOP=m
78CONFIG_BLK_DEV_NBD=m 76CONFIG_BLK_DEV_NBD=m
79CONFIG_BLK_DEV_RAM=m 77CONFIG_BLK_DEV_RAM=m
78CONFIG_MISC_DEVICES=y
80CONFIG_ATMEL_TCLIB=y 79CONFIG_ATMEL_TCLIB=y
81CONFIG_NETDEVICES=y 80CONFIG_NETDEVICES=y
81CONFIG_TUN=m
82CONFIG_NET_ETHERNET=y 82CONFIG_NET_ETHERNET=y
83CONFIG_MACB=y 83CONFIG_MACB=y
84# CONFIG_NETDEV_1000 is not set 84# CONFIG_NETDEV_1000 is not set
@@ -107,6 +107,7 @@ CONFIG_I2C_GPIO=m
107CONFIG_SPI=y 107CONFIG_SPI=y
108CONFIG_SPI_ATMEL=y 108CONFIG_SPI_ATMEL=y
109CONFIG_SPI_SPIDEV=m 109CONFIG_SPI_SPIDEV=m
110CONFIG_GPIO_SYSFS=y
110# CONFIG_HWMON is not set 111# CONFIG_HWMON is not set
111CONFIG_WATCHDOG=y 112CONFIG_WATCHDOG=y
112CONFIG_AT32AP700X_WDT=y 113CONFIG_AT32AP700X_WDT=y
@@ -130,6 +131,7 @@ CONFIG_USB_FILE_STORAGE=m
130CONFIG_USB_G_SERIAL=m 131CONFIG_USB_G_SERIAL=m
131CONFIG_USB_CDC_COMPOSITE=m 132CONFIG_USB_CDC_COMPOSITE=m
132CONFIG_MMC=y 133CONFIG_MMC=y
134CONFIG_MMC_TEST=m
133CONFIG_MMC_ATMELMCI=y 135CONFIG_MMC_ATMELMCI=y
134CONFIG_NEW_LEDS=y 136CONFIG_NEW_LEDS=y
135CONFIG_LEDS_CLASS=y 137CONFIG_LEDS_CLASS=y
@@ -144,11 +146,14 @@ CONFIG_EXT2_FS=y
144CONFIG_EXT3_FS=y 146CONFIG_EXT3_FS=y
145# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 147# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
146# CONFIG_EXT3_FS_XATTR is not set 148# CONFIG_EXT3_FS_XATTR is not set
149CONFIG_EXT4_FS=y
150# CONFIG_EXT4_FS_XATTR is not set
147# CONFIG_DNOTIFY is not set 151# CONFIG_DNOTIFY is not set
148CONFIG_FUSE_FS=m 152CONFIG_FUSE_FS=m
149CONFIG_MSDOS_FS=m 153CONFIG_MSDOS_FS=m
150CONFIG_VFAT_FS=m 154CONFIG_VFAT_FS=m
151CONFIG_FAT_DEFAULT_CODEPAGE=850 155CONFIG_FAT_DEFAULT_CODEPAGE=850
156CONFIG_PROC_KCORE=y
152CONFIG_TMPFS=y 157CONFIG_TMPFS=y
153CONFIG_CONFIGFS_FS=y 158CONFIG_CONFIGFS_FS=y
154CONFIG_JFFS2_FS=y 159CONFIG_JFFS2_FS=y
@@ -158,7 +163,6 @@ CONFIG_NFS_V3=y
158CONFIG_ROOT_NFS=y 163CONFIG_ROOT_NFS=y
159CONFIG_NFSD=m 164CONFIG_NFSD=m
160CONFIG_NFSD_V3=y 165CONFIG_NFSD_V3=y
161CONFIG_SMB_FS=m
162CONFIG_CIFS=m 166CONFIG_CIFS=m
163CONFIG_NLS_CODEPAGE_437=m 167CONFIG_NLS_CODEPAGE_437=m
164CONFIG_NLS_CODEPAGE_850=m 168CONFIG_NLS_CODEPAGE_850=m
@@ -169,4 +173,3 @@ CONFIG_DEBUG_FS=y
169CONFIG_DEBUG_KERNEL=y 173CONFIG_DEBUG_KERNEL=y
170CONFIG_DETECT_HUNG_TASK=y 174CONFIG_DETECT_HUNG_TASK=y
171CONFIG_FRAME_POINTER=y 175CONFIG_FRAME_POINTER=y
172# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
index bcc90ea1b4dc..6f37f70c2c37 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
@@ -2,10 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
@@ -15,7 +13,6 @@ CONFIG_OPROFILE=m
15# CONFIG_KPROBES is not set 13# CONFIG_KPROBES is not set
16CONFIG_MODULES=y 14CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
20# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
21CONFIG_NO_HZ=y 18CONFIG_NO_HZ=y
@@ -31,6 +28,7 @@ CONFIG_CPU_FREQ=y
31CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 28CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
32CONFIG_CPU_FREQ_GOV_USERSPACE=y 29CONFIG_CPU_FREQ_GOV_USERSPACE=y
33CONFIG_CPU_FREQ_AT32AP=y 30CONFIG_CPU_FREQ_AT32AP=y
31CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
34CONFIG_NET=y 32CONFIG_NET=y
35CONFIG_PACKET=y 33CONFIG_PACKET=y
36CONFIG_UNIX=y 34CONFIG_UNIX=y
@@ -76,8 +74,10 @@ CONFIG_MTD_UBI=y
76CONFIG_BLK_DEV_LOOP=m 74CONFIG_BLK_DEV_LOOP=m
77CONFIG_BLK_DEV_NBD=m 75CONFIG_BLK_DEV_NBD=m
78CONFIG_BLK_DEV_RAM=m 76CONFIG_BLK_DEV_RAM=m
77CONFIG_MISC_DEVICES=y
79CONFIG_ATMEL_TCLIB=y 78CONFIG_ATMEL_TCLIB=y
80CONFIG_NETDEVICES=y 79CONFIG_NETDEVICES=y
80CONFIG_TUN=m
81CONFIG_NET_ETHERNET=y 81CONFIG_NET_ETHERNET=y
82CONFIG_MACB=y 82CONFIG_MACB=y
83# CONFIG_NETDEV_1000 is not set 83# CONFIG_NETDEV_1000 is not set
@@ -106,6 +106,7 @@ CONFIG_I2C_GPIO=m
106CONFIG_SPI=y 106CONFIG_SPI=y
107CONFIG_SPI_ATMEL=y 107CONFIG_SPI_ATMEL=y
108CONFIG_SPI_SPIDEV=m 108CONFIG_SPI_SPIDEV=m
109CONFIG_GPIO_SYSFS=y
109# CONFIG_HWMON is not set 110# CONFIG_HWMON is not set
110CONFIG_WATCHDOG=y 111CONFIG_WATCHDOG=y
111CONFIG_AT32AP700X_WDT=y 112CONFIG_AT32AP700X_WDT=y
@@ -129,6 +130,7 @@ CONFIG_USB_FILE_STORAGE=m
129CONFIG_USB_G_SERIAL=m 130CONFIG_USB_G_SERIAL=m
130CONFIG_USB_CDC_COMPOSITE=m 131CONFIG_USB_CDC_COMPOSITE=m
131CONFIG_MMC=y 132CONFIG_MMC=y
133CONFIG_MMC_TEST=m
132CONFIG_MMC_ATMELMCI=y 134CONFIG_MMC_ATMELMCI=y
133CONFIG_NEW_LEDS=y 135CONFIG_NEW_LEDS=y
134CONFIG_LEDS_CLASS=y 136CONFIG_LEDS_CLASS=y
@@ -143,11 +145,14 @@ CONFIG_EXT2_FS=y
143CONFIG_EXT3_FS=y 145CONFIG_EXT3_FS=y
144# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 146# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
145# CONFIG_EXT3_FS_XATTR is not set 147# CONFIG_EXT3_FS_XATTR is not set
148CONFIG_EXT4_FS=y
149# CONFIG_EXT4_FS_XATTR is not set
146# CONFIG_DNOTIFY is not set 150# CONFIG_DNOTIFY is not set
147CONFIG_FUSE_FS=m 151CONFIG_FUSE_FS=m
148CONFIG_MSDOS_FS=m 152CONFIG_MSDOS_FS=m
149CONFIG_VFAT_FS=m 153CONFIG_VFAT_FS=m
150CONFIG_FAT_DEFAULT_CODEPAGE=850 154CONFIG_FAT_DEFAULT_CODEPAGE=850
155CONFIG_PROC_KCORE=y
151CONFIG_TMPFS=y 156CONFIG_TMPFS=y
152CONFIG_CONFIGFS_FS=y 157CONFIG_CONFIGFS_FS=y
153CONFIG_JFFS2_FS=y 158CONFIG_JFFS2_FS=y
@@ -157,7 +162,6 @@ CONFIG_NFS_V3=y
157CONFIG_ROOT_NFS=y 162CONFIG_ROOT_NFS=y
158CONFIG_NFSD=m 163CONFIG_NFSD=m
159CONFIG_NFSD_V3=y 164CONFIG_NFSD_V3=y
160CONFIG_SMB_FS=m
161CONFIG_CIFS=m 165CONFIG_CIFS=m
162CONFIG_NLS_CODEPAGE_437=m 166CONFIG_NLS_CODEPAGE_437=m
163CONFIG_NLS_CODEPAGE_850=m 167CONFIG_NLS_CODEPAGE_850=m
@@ -168,4 +172,3 @@ CONFIG_DEBUG_FS=y
168CONFIG_DEBUG_KERNEL=y 172CONFIG_DEBUG_KERNEL=y
169CONFIG_DETECT_HUNG_TASK=y 173CONFIG_DETECT_HUNG_TASK=y
170CONFIG_FRAME_POINTER=y 174CONFIG_FRAME_POINTER=y
171# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index a7536b8afb46..4fb01f5ab42f 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -3,7 +3,6 @@ CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7CONFIG_RELAY=y 6CONFIG_RELAY=y
8CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
9# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
@@ -26,6 +25,7 @@ CONFIG_CPU_FREQ=y
26CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 25CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
27CONFIG_CPU_FREQ_GOV_USERSPACE=y 26CONFIG_CPU_FREQ_GOV_USERSPACE=y
28CONFIG_CPU_FREQ_AT32AP=y 27CONFIG_CPU_FREQ_AT32AP=y
28CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
29CONFIG_NET=y 29CONFIG_NET=y
30CONFIG_PACKET=y 30CONFIG_PACKET=y
31CONFIG_UNIX=y 31CONFIG_UNIX=y
@@ -35,6 +35,7 @@ CONFIG_INET=y
35CONFIG_IP_PNP=y 35CONFIG_IP_PNP=y
36CONFIG_IP_PNP_DHCP=y 36CONFIG_IP_PNP_DHCP=y
37CONFIG_NET_IPIP=m 37CONFIG_NET_IPIP=m
38CONFIG_NET_IPGRE_DEMUX=m
38CONFIG_NET_IPGRE=m 39CONFIG_NET_IPGRE=m
39CONFIG_INET_AH=m 40CONFIG_INET_AH=m
40CONFIG_INET_ESP=m 41CONFIG_INET_ESP=m
@@ -58,16 +59,14 @@ CONFIG_MTD_BLOCK=y
58CONFIG_MTD_CFI=y 59CONFIG_MTD_CFI=y
59CONFIG_MTD_CFI_AMDSTD=y 60CONFIG_MTD_CFI_AMDSTD=y
60CONFIG_MTD_PHYSMAP=y 61CONFIG_MTD_PHYSMAP=y
61CONFIG_MTD_DATAFLASH=m
62CONFIG_MTD_M25P80=m
63CONFIG_MTD_UBI=y 62CONFIG_MTD_UBI=y
64CONFIG_BLK_DEV_LOOP=m 63CONFIG_BLK_DEV_LOOP=m
65CONFIG_BLK_DEV_NBD=m 64CONFIG_BLK_DEV_NBD=m
66CONFIG_BLK_DEV_RAM=m 65CONFIG_BLK_DEV_RAM=m
66CONFIG_MISC_DEVICES=y
67CONFIG_ATMEL_PWM=m 67CONFIG_ATMEL_PWM=m
68CONFIG_ATMEL_TCLIB=y 68CONFIG_ATMEL_TCLIB=y
69CONFIG_ATMEL_SSC=m 69CONFIG_ATMEL_SSC=m
70CONFIG_EEPROM_AT24=m
71# CONFIG_SCSI_PROC_FS is not set 70# CONFIG_SCSI_PROC_FS is not set
72CONFIG_BLK_DEV_SD=m 71CONFIG_BLK_DEV_SD=m
73CONFIG_BLK_DEV_SR=m 72CONFIG_BLK_DEV_SR=m
@@ -120,7 +119,6 @@ CONFIG_SND_MIXER_OSS=m
120CONFIG_SND_PCM_OSS=m 119CONFIG_SND_PCM_OSS=m
121# CONFIG_SND_SUPPORT_OLD_API is not set 120# CONFIG_SND_SUPPORT_OLD_API is not set
122# CONFIG_SND_VERBOSE_PROCFS is not set 121# CONFIG_SND_VERBOSE_PROCFS is not set
123# CONFIG_SND_DRIVERS is not set
124CONFIG_SND_AT73C213=m 122CONFIG_SND_AT73C213=m
125# CONFIG_HID_SUPPORT is not set 123# CONFIG_HID_SUPPORT is not set
126CONFIG_USB_GADGET=y 124CONFIG_USB_GADGET=y
@@ -131,16 +129,15 @@ CONFIG_USB_FILE_STORAGE=m
131CONFIG_USB_G_SERIAL=m 129CONFIG_USB_G_SERIAL=m
132CONFIG_USB_CDC_COMPOSITE=m 130CONFIG_USB_CDC_COMPOSITE=m
133CONFIG_MMC=y 131CONFIG_MMC=y
132CONFIG_MMC_TEST=m
134CONFIG_MMC_ATMELMCI=y 133CONFIG_MMC_ATMELMCI=y
135CONFIG_MMC_SPI=m
136CONFIG_NEW_LEDS=y 134CONFIG_NEW_LEDS=y
137CONFIG_LEDS_CLASS=m 135CONFIG_LEDS_CLASS=y
138CONFIG_LEDS_ATMEL_PWM=m 136CONFIG_LEDS_ATMEL_PWM=m
139CONFIG_LEDS_GPIO=m 137CONFIG_LEDS_GPIO=m
140CONFIG_LEDS_TRIGGERS=y 138CONFIG_LEDS_TRIGGERS=y
141CONFIG_LEDS_TRIGGER_TIMER=m 139CONFIG_LEDS_TRIGGER_TIMER=m
142CONFIG_LEDS_TRIGGER_HEARTBEAT=m 140CONFIG_LEDS_TRIGGER_HEARTBEAT=m
143CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
144CONFIG_RTC_CLASS=y 141CONFIG_RTC_CLASS=y
145CONFIG_RTC_DRV_AT32AP700X=y 142CONFIG_RTC_DRV_AT32AP700X=y
146CONFIG_DMADEVICES=y 143CONFIG_DMADEVICES=y
@@ -149,20 +146,23 @@ CONFIG_EXT3_FS=y
149# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 146# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
150# CONFIG_EXT3_FS_XATTR is not set 147# CONFIG_EXT3_FS_XATTR is not set
151CONFIG_EXT4_FS=y 148CONFIG_EXT4_FS=y
149# CONFIG_EXT4_FS_XATTR is not set
152# CONFIG_DNOTIFY is not set 150# CONFIG_DNOTIFY is not set
153CONFIG_FUSE_FS=m 151CONFIG_FUSE_FS=m
154CONFIG_MSDOS_FS=m 152CONFIG_MSDOS_FS=m
155CONFIG_VFAT_FS=m 153CONFIG_VFAT_FS=m
154CONFIG_FAT_DEFAULT_CODEPAGE=850
156CONFIG_PROC_KCORE=y 155CONFIG_PROC_KCORE=y
157CONFIG_TMPFS=y 156CONFIG_TMPFS=y
157CONFIG_CONFIGFS_FS=y
158CONFIG_JFFS2_FS=y 158CONFIG_JFFS2_FS=y
159# CONFIG_JFFS2_FS_WRITEBUFFER is not set
160CONFIG_UBIFS_FS=y 159CONFIG_UBIFS_FS=y
161CONFIG_MINIX_FS=m
162CONFIG_NFS_FS=y 160CONFIG_NFS_FS=y
163CONFIG_NFS_V3=y 161CONFIG_NFS_V3=y
164CONFIG_ROOT_NFS=y 162CONFIG_ROOT_NFS=y
163CONFIG_CIFS=m
165CONFIG_NLS_CODEPAGE_437=m 164CONFIG_NLS_CODEPAGE_437=m
165CONFIG_NLS_CODEPAGE_850=m
166CONFIG_NLS_ISO8859_1=m 166CONFIG_NLS_ISO8859_1=m
167CONFIG_NLS_UTF8=m 167CONFIG_NLS_UTF8=m
168CONFIG_MAGIC_SYSRQ=y 168CONFIG_MAGIC_SYSRQ=y
@@ -170,6 +170,3 @@ CONFIG_DEBUG_FS=y
170CONFIG_DEBUG_KERNEL=y 170CONFIG_DEBUG_KERNEL=y
171CONFIG_DETECT_HUNG_TASK=y 171CONFIG_DETECT_HUNG_TASK=y
172CONFIG_FRAME_POINTER=y 172CONFIG_FRAME_POINTER=y
173# CONFIG_RCU_CPU_STALL_DETECTOR is not set
174# CONFIG_CRYPTO_HW is not set
175CONFIG_CRC_T10DIF=m
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index e19662af22f0..9faaf9b900f2 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -2,18 +2,11 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_TASKSTATS=y
8CONFIG_TASK_DELAY_ACCT=y
9CONFIG_AUDIT=y
10CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
11CONFIG_SYSFS_DEPRECATED_V2=y
12CONFIG_RELAY=y 6CONFIG_RELAY=y
13CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
14# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
15# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
16# CONFIG_SLUB_DEBUG is not set
17# CONFIG_COMPAT_BRK is not set 10# CONFIG_COMPAT_BRK is not set
18CONFIG_PROFILING=y 11CONFIG_PROFILING=y
19CONFIG_OPROFILE=m 12CONFIG_OPROFILE=m
@@ -33,6 +26,7 @@ CONFIG_CPU_FREQ=y
33CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 26CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
34CONFIG_CPU_FREQ_GOV_USERSPACE=y 27CONFIG_CPU_FREQ_GOV_USERSPACE=y
35CONFIG_CPU_FREQ_AT32AP=y 28CONFIG_CPU_FREQ_AT32AP=y
29CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
36CONFIG_NET=y 30CONFIG_NET=y
37CONFIG_PACKET=y 31CONFIG_PACKET=y
38CONFIG_UNIX=y 32CONFIG_UNIX=y
@@ -54,18 +48,18 @@ CONFIG_MTD_BLOCK=y
54CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
55CONFIG_MTD_CFI_AMDSTD=y 49CONFIG_MTD_CFI_AMDSTD=y
56CONFIG_MTD_PHYSMAP=y 50CONFIG_MTD_PHYSMAP=y
57CONFIG_MTD_DATAFLASH=m 51CONFIG_MTD_UBI=y
58CONFIG_MTD_M25P80=m
59CONFIG_BLK_DEV_LOOP=m 52CONFIG_BLK_DEV_LOOP=m
60CONFIG_BLK_DEV_NBD=m 53CONFIG_BLK_DEV_NBD=m
61CONFIG_BLK_DEV_RAM=m 54CONFIG_BLK_DEV_RAM=m
55CONFIG_MISC_DEVICES=y
62CONFIG_ATMEL_PWM=m 56CONFIG_ATMEL_PWM=m
63CONFIG_ATMEL_TCLIB=y 57CONFIG_ATMEL_TCLIB=y
64CONFIG_ATMEL_SSC=m 58CONFIG_ATMEL_SSC=m
65CONFIG_EEPROM_AT24=m
66# CONFIG_SCSI_PROC_FS is not set 59# CONFIG_SCSI_PROC_FS is not set
67CONFIG_BLK_DEV_SD=m 60CONFIG_BLK_DEV_SD=m
68CONFIG_BLK_DEV_SR=m 61CONFIG_BLK_DEV_SR=m
62# CONFIG_SCSI_LOWLEVEL is not set
69CONFIG_ATA=m 63CONFIG_ATA=m
70# CONFIG_SATA_PMP is not set 64# CONFIG_SATA_PMP is not set
71CONFIG_PATA_AT32=m 65CONFIG_PATA_AT32=m
@@ -77,6 +71,7 @@ CONFIG_PPP_ASYNC=m
77CONFIG_PPP_DEFLATE=m 71CONFIG_PPP_DEFLATE=m
78CONFIG_PPP_BSDCOMP=m 72CONFIG_PPP_BSDCOMP=m
79CONFIG_INPUT=m 73CONFIG_INPUT=m
74CONFIG_INPUT_EVDEV=m
80# CONFIG_KEYBOARD_ATKBD is not set 75# CONFIG_KEYBOARD_ATKBD is not set
81CONFIG_KEYBOARD_GPIO=m 76CONFIG_KEYBOARD_GPIO=m
82# CONFIG_MOUSE_PS2 is not set 77# CONFIG_MOUSE_PS2 is not set
@@ -106,7 +101,6 @@ CONFIG_SND_PCM_OSS=m
106CONFIG_SND_AT73C213=m 101CONFIG_SND_AT73C213=m
107# CONFIG_HID_SUPPORT is not set 102# CONFIG_HID_SUPPORT is not set
108CONFIG_USB_GADGET=y 103CONFIG_USB_GADGET=y
109CONFIG_USB_GADGET_DEBUG_FS=y
110CONFIG_USB_ZERO=m 104CONFIG_USB_ZERO=m
111CONFIG_USB_ETH=m 105CONFIG_USB_ETH=m
112CONFIG_USB_GADGETFS=m 106CONFIG_USB_GADGETFS=m
@@ -116,36 +110,39 @@ CONFIG_USB_CDC_COMPOSITE=m
116CONFIG_MMC=y 110CONFIG_MMC=y
117CONFIG_MMC_TEST=m 111CONFIG_MMC_TEST=m
118CONFIG_MMC_ATMELMCI=y 112CONFIG_MMC_ATMELMCI=y
119CONFIG_MMC_SPI=m
120CONFIG_NEW_LEDS=y 113CONFIG_NEW_LEDS=y
121CONFIG_LEDS_CLASS=y 114CONFIG_LEDS_CLASS=y
122CONFIG_LEDS_ATMEL_PWM=m 115CONFIG_LEDS_ATMEL_PWM=m
123CONFIG_LEDS_GPIO=y 116CONFIG_LEDS_GPIO=m
124CONFIG_LEDS_TRIGGERS=y 117CONFIG_LEDS_TRIGGERS=y
125CONFIG_LEDS_TRIGGER_TIMER=y 118CONFIG_LEDS_TRIGGER_TIMER=m
126CONFIG_LEDS_TRIGGER_HEARTBEAT=y 119CONFIG_LEDS_TRIGGER_HEARTBEAT=m
127CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
128CONFIG_RTC_CLASS=y 120CONFIG_RTC_CLASS=y
129CONFIG_RTC_DRV_AT32AP700X=y 121CONFIG_RTC_DRV_AT32AP700X=y
130CONFIG_DMADEVICES=y 122CONFIG_DMADEVICES=y
131CONFIG_DW_DMAC=y 123CONFIG_EXT2_FS=y
132CONFIG_EXT2_FS=m 124CONFIG_EXT3_FS=y
133CONFIG_EXT3_FS=m 125# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
134# CONFIG_EXT3_FS_XATTR is not set 126# CONFIG_EXT3_FS_XATTR is not set
127CONFIG_EXT4_FS=y
128# CONFIG_EXT4_FS_XATTR is not set
135# CONFIG_DNOTIFY is not set 129# CONFIG_DNOTIFY is not set
136CONFIG_FUSE_FS=m 130CONFIG_FUSE_FS=m
137CONFIG_MSDOS_FS=m 131CONFIG_MSDOS_FS=m
138CONFIG_VFAT_FS=m 132CONFIG_VFAT_FS=m
133CONFIG_FAT_DEFAULT_CODEPAGE=850
139CONFIG_PROC_KCORE=y 134CONFIG_PROC_KCORE=y
140CONFIG_TMPFS=y 135CONFIG_TMPFS=y
141CONFIG_CONFIGFS_FS=m 136CONFIG_CONFIGFS_FS=y
142CONFIG_JFFS2_FS=y 137CONFIG_JFFS2_FS=y
138CONFIG_UBIFS_FS=y
143# CONFIG_NETWORK_FILESYSTEMS is not set 139# CONFIG_NETWORK_FILESYSTEMS is not set
144CONFIG_NLS_CODEPAGE_437=m 140CONFIG_NLS_CODEPAGE_437=m
141CONFIG_NLS_CODEPAGE_850=m
145CONFIG_NLS_ISO8859_1=m 142CONFIG_NLS_ISO8859_1=m
146CONFIG_NLS_UTF8=m 143CONFIG_NLS_UTF8=m
147CONFIG_MAGIC_SYSRQ=y 144CONFIG_MAGIC_SYSRQ=y
148CONFIG_DEBUG_FS=y 145CONFIG_DEBUG_FS=y
149CONFIG_DEBUG_KERNEL=y 146CONFIG_DEBUG_KERNEL=y
147CONFIG_DETECT_HUNG_TASK=y
150CONFIG_FRAME_POINTER=y 148CONFIG_FRAME_POINTER=y
151CONFIG_CRC_T10DIF=m
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 329e10ba3b54..3d2a5d85f970 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -1,19 +1,32 @@
1CONFIG_EXPERIMENTAL=y 1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y
3CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
4CONFIG_SYSFS_DEPRECATED_V2=y 6CONFIG_RELAY=y
7CONFIG_BLK_DEV_INITRD=y
5# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
6# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
7# CONFIG_FUTEX is not set
8# CONFIG_EPOLL is not set
9# CONFIG_SIGNALFD is not set
10# CONFIG_TIMERFD is not set
11# CONFIG_EVENTFD is not set
12# CONFIG_COMPAT_BRK is not set 10# CONFIG_COMPAT_BRK is not set
13CONFIG_SLOB=y 11CONFIG_PROFILING=y
14# CONFIG_BLOCK is not set 12CONFIG_OPROFILE=m
13# CONFIG_KPROBES is not set
14CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y
16# CONFIG_BLK_DEV_BSG is not set
17# CONFIG_IOSCHED_DEADLINE is not set
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BOARD_ATSTK1004=y 20CONFIG_BOARD_ATSTK1004=y
16# CONFIG_OWNERSHIP_TRACE is not set 21# CONFIG_OWNERSHIP_TRACE is not set
22CONFIG_NMI_DEBUGGING=y
23CONFIG_PM=y
24CONFIG_CPU_FREQ=y
25# CONFIG_CPU_FREQ_STAT is not set
26CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
27CONFIG_CPU_FREQ_GOV_USERSPACE=y
28CONFIG_CPU_FREQ_AT32AP=y
29CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
17CONFIG_NET=y 30CONFIG_NET=y
18CONFIG_PACKET=y 31CONFIG_PACKET=y
19CONFIG_UNIX=y 32CONFIG_UNIX=y
@@ -31,40 +44,104 @@ CONFIG_MTD=y
31CONFIG_MTD_PARTITIONS=y 44CONFIG_MTD_PARTITIONS=y
32CONFIG_MTD_CMDLINE_PARTS=y 45CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_CHAR=y 46CONFIG_MTD_CHAR=y
47CONFIG_MTD_BLOCK=y
34CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 49CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP=y 50CONFIG_MTD_PHYSMAP=y
37# CONFIG_MISC_DEVICES is not set 51CONFIG_MTD_UBI=y
38# CONFIG_INPUT is not set 52CONFIG_BLK_DEV_LOOP=m
53CONFIG_BLK_DEV_NBD=m
54CONFIG_BLK_DEV_RAM=m
55CONFIG_MISC_DEVICES=y
56CONFIG_ATMEL_PWM=m
57CONFIG_ATMEL_TCLIB=y
58CONFIG_ATMEL_SSC=m
59# CONFIG_SCSI_PROC_FS is not set
60CONFIG_BLK_DEV_SD=m
61CONFIG_BLK_DEV_SR=m
62# CONFIG_SCSI_LOWLEVEL is not set
63CONFIG_ATA=m
64# CONFIG_SATA_PMP is not set
65CONFIG_PATA_AT32=m
66CONFIG_NETDEVICES=y
67# CONFIG_NETDEV_1000 is not set
68# CONFIG_NETDEV_10000 is not set
69CONFIG_PPP=m
70CONFIG_PPP_ASYNC=m
71CONFIG_PPP_DEFLATE=m
72CONFIG_PPP_BSDCOMP=m
73CONFIG_INPUT=m
74CONFIG_INPUT_EVDEV=m
75# CONFIG_KEYBOARD_ATKBD is not set
76CONFIG_KEYBOARD_GPIO=m
77# CONFIG_MOUSE_PS2 is not set
78CONFIG_MOUSE_GPIO=m
39# CONFIG_SERIO is not set 79# CONFIG_SERIO is not set
40# CONFIG_VT is not set 80# CONFIG_VT is not set
41# CONFIG_DEVKMEM is not set 81# CONFIG_DEVKMEM is not set
42CONFIG_SERIAL_ATMEL=y 82CONFIG_SERIAL_ATMEL=y
43CONFIG_SERIAL_ATMEL_CONSOLE=y 83CONFIG_SERIAL_ATMEL_CONSOLE=y
44# CONFIG_SERIAL_ATMEL_PDC is not set
45# CONFIG_LEGACY_PTYS is not set 84# CONFIG_LEGACY_PTYS is not set
46# CONFIG_HW_RANDOM is not set 85# CONFIG_HW_RANDOM is not set
86CONFIG_I2C=m
87CONFIG_I2C_CHARDEV=m
88CONFIG_I2C_GPIO=m
47CONFIG_SPI=y 89CONFIG_SPI=y
48CONFIG_SPI_ATMEL=y 90CONFIG_SPI_ATMEL=y
91CONFIG_SPI_SPIDEV=m
92CONFIG_GPIO_SYSFS=y
49# CONFIG_HWMON is not set 93# CONFIG_HWMON is not set
50CONFIG_WATCHDOG=y 94CONFIG_WATCHDOG=y
51CONFIG_AT32AP700X_WDT=y 95CONFIG_AT32AP700X_WDT=y
52CONFIG_FB=y 96CONFIG_FB=y
53CONFIG_FB_ATMEL=y 97CONFIG_FB_ATMEL=y
54CONFIG_BACKLIGHT_LCD_SUPPORT=y 98CONFIG_BACKLIGHT_LCD_SUPPORT=y
99CONFIG_LCD_CLASS_DEVICE=y
55CONFIG_LCD_LTV350QV=y 100CONFIG_LCD_LTV350QV=y
56# CONFIG_BACKLIGHT_CLASS_DEVICE is not set 101# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
57CONFIG_USB_GADGET=y 102CONFIG_USB_GADGET=y
58CONFIG_USB_ETH=y 103CONFIG_USB_ZERO=m
59# CONFIG_USB_ETH_RNDIS is not set 104CONFIG_USB_ETH=m
105CONFIG_USB_GADGETFS=m
106CONFIG_USB_FILE_STORAGE=m
107CONFIG_USB_G_SERIAL=m
108CONFIG_USB_CDC_COMPOSITE=m
109CONFIG_MMC=y
110CONFIG_MMC_TEST=m
111CONFIG_MMC_ATMELMCI=y
112CONFIG_NEW_LEDS=y
113CONFIG_LEDS_CLASS=y
114CONFIG_LEDS_ATMEL_PWM=m
115CONFIG_LEDS_GPIO=m
116CONFIG_LEDS_TRIGGERS=y
117CONFIG_LEDS_TRIGGER_TIMER=m
118CONFIG_LEDS_TRIGGER_HEARTBEAT=m
60CONFIG_RTC_CLASS=y 119CONFIG_RTC_CLASS=y
61# CONFIG_RTC_INTF_PROC is not set
62CONFIG_RTC_DRV_AT32AP700X=y 120CONFIG_RTC_DRV_AT32AP700X=y
121CONFIG_DMADEVICES=y
122CONFIG_EXT2_FS=y
123CONFIG_EXT3_FS=y
124# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
125# CONFIG_EXT3_FS_XATTR is not set
126CONFIG_EXT4_FS=y
127# CONFIG_EXT4_FS_XATTR is not set
63# CONFIG_DNOTIFY is not set 128# CONFIG_DNOTIFY is not set
129CONFIG_FUSE_FS=m
130CONFIG_MSDOS_FS=m
131CONFIG_VFAT_FS=m
132CONFIG_FAT_DEFAULT_CODEPAGE=850
64CONFIG_PROC_KCORE=y 133CONFIG_PROC_KCORE=y
65# CONFIG_PROC_PAGE_MONITOR is not set
66CONFIG_TMPFS=y 134CONFIG_TMPFS=y
135CONFIG_CONFIGFS_FS=y
67CONFIG_JFFS2_FS=y 136CONFIG_JFFS2_FS=y
68# CONFIG_JFFS2_FS_WRITEBUFFER is not set 137CONFIG_UBIFS_FS=y
69# CONFIG_NETWORK_FILESYSTEMS is not set 138# CONFIG_NETWORK_FILESYSTEMS is not set
139CONFIG_NLS_CODEPAGE_437=m
140CONFIG_NLS_CODEPAGE_850=m
141CONFIG_NLS_ISO8859_1=m
142CONFIG_NLS_UTF8=m
70CONFIG_MAGIC_SYSRQ=y 143CONFIG_MAGIC_SYSRQ=y
144CONFIG_DEBUG_FS=y
145CONFIG_DEBUG_KERNEL=y
146CONFIG_DETECT_HUNG_TASK=y
147CONFIG_FRAME_POINTER=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index ef76b4fb8658..1ed8f22d4fe2 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -3,7 +3,6 @@ CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7CONFIG_RELAY=y 6CONFIG_RELAY=y
8CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
9# CONFIG_SYSCTL_SYSCALL is not set 8# CONFIG_SYSCTL_SYSCALL is not set
@@ -37,6 +36,7 @@ CONFIG_INET=y
37CONFIG_IP_PNP=y 36CONFIG_IP_PNP=y
38CONFIG_IP_PNP_DHCP=y 37CONFIG_IP_PNP_DHCP=y
39CONFIG_NET_IPIP=m 38CONFIG_NET_IPIP=m
39CONFIG_NET_IPGRE_DEMUX=m
40CONFIG_NET_IPGRE=m 40CONFIG_NET_IPGRE=m
41CONFIG_INET_AH=m 41CONFIG_INET_AH=m
42CONFIG_INET_ESP=m 42CONFIG_INET_ESP=m
@@ -60,15 +60,13 @@ CONFIG_MTD_BLOCK=y
60CONFIG_MTD_CFI=y 60CONFIG_MTD_CFI=y
61CONFIG_MTD_CFI_AMDSTD=y 61CONFIG_MTD_CFI_AMDSTD=y
62CONFIG_MTD_PHYSMAP=y 62CONFIG_MTD_PHYSMAP=y
63CONFIG_MTD_DATAFLASH=m
64CONFIG_MTD_DATAFLASH_OTP=y
65CONFIG_MTD_M25P80=m
66CONFIG_MTD_NAND=y 63CONFIG_MTD_NAND=y
67CONFIG_MTD_NAND_ATMEL=y 64CONFIG_MTD_NAND_ATMEL=y
68CONFIG_MTD_UBI=y 65CONFIG_MTD_UBI=y
69CONFIG_BLK_DEV_LOOP=m 66CONFIG_BLK_DEV_LOOP=m
70CONFIG_BLK_DEV_NBD=m 67CONFIG_BLK_DEV_NBD=m
71CONFIG_BLK_DEV_RAM=m 68CONFIG_BLK_DEV_RAM=m
69CONFIG_MISC_DEVICES=y
72CONFIG_ATMEL_PWM=m 70CONFIG_ATMEL_PWM=m
73CONFIG_ATMEL_TCLIB=y 71CONFIG_ATMEL_TCLIB=y
74CONFIG_ATMEL_SSC=m 72CONFIG_ATMEL_SSC=m
@@ -132,17 +130,17 @@ CONFIG_USB_ETH=m
132CONFIG_USB_GADGETFS=m 130CONFIG_USB_GADGETFS=m
133CONFIG_USB_FILE_STORAGE=m 131CONFIG_USB_FILE_STORAGE=m
134CONFIG_USB_G_SERIAL=m 132CONFIG_USB_G_SERIAL=m
133CONFIG_USB_CDC_COMPOSITE=m
135CONFIG_MMC=y 134CONFIG_MMC=y
135CONFIG_MMC_TEST=m
136CONFIG_MMC_ATMELMCI=y 136CONFIG_MMC_ATMELMCI=y
137CONFIG_MMC_SPI=m
138CONFIG_NEW_LEDS=y 137CONFIG_NEW_LEDS=y
139CONFIG_LEDS_CLASS=m 138CONFIG_LEDS_CLASS=y
140CONFIG_LEDS_ATMEL_PWM=m 139CONFIG_LEDS_ATMEL_PWM=m
141CONFIG_LEDS_GPIO=m 140CONFIG_LEDS_GPIO=m
142CONFIG_LEDS_TRIGGERS=y 141CONFIG_LEDS_TRIGGERS=y
143CONFIG_LEDS_TRIGGER_TIMER=m 142CONFIG_LEDS_TRIGGER_TIMER=m
144CONFIG_LEDS_TRIGGER_HEARTBEAT=m 143CONFIG_LEDS_TRIGGER_HEARTBEAT=m
145CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
146CONFIG_RTC_CLASS=y 144CONFIG_RTC_CLASS=y
147CONFIG_RTC_DRV_AT32AP700X=y 145CONFIG_RTC_DRV_AT32AP700X=y
148CONFIG_DMADEVICES=y 146CONFIG_DMADEVICES=y
@@ -156,15 +154,18 @@ CONFIG_EXT4_FS=y
156CONFIG_FUSE_FS=m 154CONFIG_FUSE_FS=m
157CONFIG_MSDOS_FS=m 155CONFIG_MSDOS_FS=m
158CONFIG_VFAT_FS=m 156CONFIG_VFAT_FS=m
157CONFIG_FAT_DEFAULT_CODEPAGE=850
159CONFIG_PROC_KCORE=y 158CONFIG_PROC_KCORE=y
160CONFIG_TMPFS=y 159CONFIG_TMPFS=y
160CONFIG_CONFIGFS_FS=y
161CONFIG_JFFS2_FS=y 161CONFIG_JFFS2_FS=y
162CONFIG_UBIFS_FS=y 162CONFIG_UBIFS_FS=y
163CONFIG_MINIX_FS=m
164CONFIG_NFS_FS=y 163CONFIG_NFS_FS=y
165CONFIG_NFS_V3=y 164CONFIG_NFS_V3=y
166CONFIG_ROOT_NFS=y 165CONFIG_ROOT_NFS=y
166CONFIG_CIFS=m
167CONFIG_NLS_CODEPAGE_437=m 167CONFIG_NLS_CODEPAGE_437=m
168CONFIG_NLS_CODEPAGE_850=m
168CONFIG_NLS_ISO8859_1=m 169CONFIG_NLS_ISO8859_1=m
169CONFIG_NLS_UTF8=m 170CONFIG_NLS_UTF8=m
170CONFIG_MAGIC_SYSRQ=y 171CONFIG_MAGIC_SYSRQ=y
@@ -172,7 +173,3 @@ CONFIG_DEBUG_FS=y
172CONFIG_DEBUG_KERNEL=y 173CONFIG_DEBUG_KERNEL=y
173CONFIG_DETECT_HUNG_TASK=y 174CONFIG_DETECT_HUNG_TASK=y
174CONFIG_FRAME_POINTER=y 175CONFIG_FRAME_POINTER=y
175# CONFIG_RCU_CPU_STALL_DETECTOR is not set
176CONFIG_CRYPTO_FIPS=y
177# CONFIG_CRYPTO_HW is not set
178CONFIG_CRC_T10DIF=m