diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 16:46:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 16:46:56 -0400 |
commit | 7b6181e06841f5ad15c4ff708b967b4db65a64de (patch) | |
tree | bdfcf5b74b692f76581156e452d268b64c795200 /arch/arm/configs | |
parent | 72e58063d63c5f0a7bf65312f1e3a5ed9bb5c2ff (diff) | |
parent | bc487fb341af05120bccb9f59ce76302391dcc77 (diff) |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
omap: complete removal of machine_desc.io_pg_offst and .phys_io
omap: UART: fix wakeup registers for OMAP24xx UART2
omap: Fix spotty MMC voltages
ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
serial: omap-serial: fix signess error
OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
omap: dma: Fix buffering disable bit setting for omap24xx
omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
OMAP3: PM: fix scratchpad memory accesses for off-mode
omap4: pandaboard: enable the ehci port on pandaboard
omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
omap4: pandaboard: remove unused hsmmc definition
OMAP: McBSP: Remove null omap44xx ops comment
OMAP: McBSP: Swap CLKS source definition
OMAP: McBSP: Fix CLKR and FSR signal muxing
OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
OMAP: control: move plat-omap/control.h to mach-omap2/control.h
OMAP: split plat-omap/common.c
OMAP: McBSP: implement functional clock switching via clock framework
OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
...
Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/n8x0_defconfig | 94 | ||||
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig (renamed from arch/arm/configs/omap3_defconfig) | 51 | ||||
-rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 125 | ||||
-rw-r--r-- | arch/arm/configs/omap_generic_2420_defconfig | 37 |
4 files changed, 26 insertions, 281 deletions
diff --git a/arch/arm/configs/n8x0_defconfig b/arch/arm/configs/n8x0_defconfig deleted file mode 100644 index 56aebb69411d..000000000000 --- a/arch/arm/configs/n8x0_defconfig +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | ||
3 | CONFIG_LOG_BUF_SHIFT=14 | ||
4 | CONFIG_BLK_DEV_INITRD=y | ||
5 | CONFIG_MODULES=y | ||
6 | CONFIG_MODULE_UNLOAD=y | ||
7 | # CONFIG_LBDAF is not set | ||
8 | # CONFIG_BLK_DEV_BSG is not set | ||
9 | # CONFIG_IOSCHED_DEADLINE is not set | ||
10 | CONFIG_ARCH_OMAP=y | ||
11 | CONFIG_ARCH_OMAP2=y | ||
12 | CONFIG_OMAP_RESET_CLOCKS=y | ||
13 | # CONFIG_OMAP_MUX is not set | ||
14 | # CONFIG_OMAP_MCBSP is not set | ||
15 | CONFIG_OMAP_MBOX_FWK=y | ||
16 | CONFIG_OMAP_32K_TIMER=y | ||
17 | CONFIG_ARCH_OMAP2420=y | ||
18 | CONFIG_MACH_NOKIA_N8X0=y | ||
19 | CONFIG_AEABI=y | ||
20 | CONFIG_LEDS=y | ||
21 | CONFIG_ZBOOT_ROM_TEXT=0x10C08000 | ||
22 | CONFIG_ZBOOT_ROM_BSS=0x10200000 | ||
23 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 console=ttyS2,115200n8 debug earlyprintk rootwait" | ||
24 | CONFIG_FPE_NWFPE=y | ||
25 | CONFIG_VFP=y | ||
26 | CONFIG_PM=y | ||
27 | CONFIG_PM_RUNTIME=y | ||
28 | CONFIG_NET=y | ||
29 | CONFIG_UNIX=y | ||
30 | CONFIG_INET=y | ||
31 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
32 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
33 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
34 | # CONFIG_INET_LRO is not set | ||
35 | # CONFIG_IPV6 is not set | ||
36 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
37 | CONFIG_MTD=y | ||
38 | CONFIG_MTD_CMDLINE_PARTS=y | ||
39 | CONFIG_MTD_ONENAND=y | ||
40 | CONFIG_MTD_ONENAND_OMAP2=y | ||
41 | CONFIG_MTD_ONENAND_OTP=y | ||
42 | CONFIG_BLK_DEV_RAM=y | ||
43 | # CONFIG_MISC_DEVICES is not set | ||
44 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
45 | # CONFIG_INPUT_KEYBOARD is not set | ||
46 | # CONFIG_INPUT_MOUSE is not set | ||
47 | CONFIG_SERIAL_8250=y | ||
48 | CONFIG_SERIAL_8250_CONSOLE=y | ||
49 | # CONFIG_LEGACY_PTYS is not set | ||
50 | # CONFIG_HW_RANDOM is not set | ||
51 | CONFIG_I2C=y | ||
52 | # CONFIG_I2C_COMPAT is not set | ||
53 | # CONFIG_I2C_HELPER_AUTO is not set | ||
54 | CONFIG_I2C_OMAP=y | ||
55 | CONFIG_SPI=y | ||
56 | CONFIG_SPI_OMAP24XX=y | ||
57 | # CONFIG_HWMON is not set | ||
58 | CONFIG_MENELAUS=y | ||
59 | CONFIG_REGULATOR=y | ||
60 | # CONFIG_VGA_CONSOLE is not set | ||
61 | # CONFIG_HID_SUPPORT is not set | ||
62 | CONFIG_USB=y | ||
63 | CONFIG_USB_DEBUG=y | ||
64 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
65 | CONFIG_USB_DEVICEFS=y | ||
66 | CONFIG_USB_SUSPEND=y | ||
67 | # CONFIG_USB_OTG_WHITELIST is not set | ||
68 | CONFIG_USB_MUSB_HDRC=y | ||
69 | CONFIG_USB_MUSB_OTG=y | ||
70 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
71 | # CONFIG_MUSB_PIO_ONLY is not set | ||
72 | CONFIG_USB_MUSB_DEBUG=y | ||
73 | CONFIG_USB_GADGET=y | ||
74 | CONFIG_USB_GADGET_DEBUG=y | ||
75 | CONFIG_USB_GADGET_DEBUG_FILES=y | ||
76 | CONFIG_USB_ETH=m | ||
77 | CONFIG_USB_ETH_EEM=y | ||
78 | CONFIG_MMC=y | ||
79 | CONFIG_MMC_OMAP=y | ||
80 | CONFIG_EXT3_FS=y | ||
81 | CONFIG_INOTIFY=y | ||
82 | CONFIG_VFAT_FS=y | ||
83 | CONFIG_TMPFS=y | ||
84 | CONFIG_JFFS2_FS=y | ||
85 | CONFIG_JFFS2_SUMMARY=y | ||
86 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
87 | CONFIG_JFFS2_LZO=y | ||
88 | CONFIG_PRINTK_TIME=y | ||
89 | CONFIG_DEBUG_KERNEL=y | ||
90 | CONFIG_DEBUG_INFO=y | ||
91 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
92 | CONFIG_DEBUG_USER=y | ||
93 | CONFIG_DEBUG_ERRORS=y | ||
94 | CONFIG_CRC_CCITT=y | ||
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap2plus_defconfig index 5db9a6be2054..ccedde1371c3 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
@@ -53,18 +53,18 @@ CONFIG_MACH_SBC3530=y | |||
53 | CONFIG_MACH_OMAP_3630SDP=y | 53 | CONFIG_MACH_OMAP_3630SDP=y |
54 | CONFIG_MACH_OMAP_4430SDP=y | 54 | CONFIG_MACH_OMAP_4430SDP=y |
55 | CONFIG_ARM_THUMBEE=y | 55 | CONFIG_ARM_THUMBEE=y |
56 | CONFIG_ARM_L1_CACHE_SHIFT=5 | ||
57 | CONFIG_ARM_ERRATA_411920=y | ||
56 | CONFIG_NO_HZ=y | 58 | CONFIG_NO_HZ=y |
57 | CONFIG_HIGH_RES_TIMERS=y | 59 | CONFIG_HIGH_RES_TIMERS=y |
60 | CONFIG_SMP=y | ||
61 | # CONFIG_LOCAL_TIMERS is not set | ||
58 | CONFIG_AEABI=y | 62 | CONFIG_AEABI=y |
59 | CONFIG_LEDS=y | 63 | CONFIG_LEDS=y |
60 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 64 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
61 | CONFIG_ZBOOT_ROM_BSS=0x0 | 65 | CONFIG_ZBOOT_ROM_BSS=0x0 |
62 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyS2,115200" | 66 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" |
63 | CONFIG_KEXEC=y | 67 | CONFIG_KEXEC=y |
64 | CONFIG_CPU_FREQ=y | ||
65 | CONFIG_CPU_FREQ_STAT_DETAILS=y | ||
66 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
67 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | ||
68 | CONFIG_FPE_NWFPE=y | 68 | CONFIG_FPE_NWFPE=y |
69 | CONFIG_VFP=y | 69 | CONFIG_VFP=y |
70 | CONFIG_NEON=y | 70 | CONFIG_NEON=y |
@@ -87,23 +87,23 @@ CONFIG_IP_PNP_RARP=y | |||
87 | # CONFIG_INET_LRO is not set | 87 | # CONFIG_INET_LRO is not set |
88 | # CONFIG_IPV6 is not set | 88 | # CONFIG_IPV6 is not set |
89 | CONFIG_NETFILTER=y | 89 | CONFIG_NETFILTER=y |
90 | CONFIG_BT=y | 90 | CONFIG_BT=m |
91 | CONFIG_BT_L2CAP=y | 91 | CONFIG_BT_L2CAP=m |
92 | CONFIG_BT_SCO=y | 92 | CONFIG_BT_SCO=m |
93 | CONFIG_BT_RFCOMM=y | 93 | CONFIG_BT_RFCOMM=y |
94 | CONFIG_BT_RFCOMM_TTY=y | 94 | CONFIG_BT_RFCOMM_TTY=y |
95 | CONFIG_BT_BNEP=y | 95 | CONFIG_BT_BNEP=m |
96 | CONFIG_BT_BNEP_MC_FILTER=y | 96 | CONFIG_BT_BNEP_MC_FILTER=y |
97 | CONFIG_BT_BNEP_PROTO_FILTER=y | 97 | CONFIG_BT_BNEP_PROTO_FILTER=y |
98 | CONFIG_BT_HIDP=y | 98 | CONFIG_BT_HIDP=m |
99 | CONFIG_BT_HCIUART=y | 99 | CONFIG_BT_HCIUART=m |
100 | CONFIG_BT_HCIUART_H4=y | 100 | CONFIG_BT_HCIUART_H4=y |
101 | CONFIG_BT_HCIUART_BCSP=y | 101 | CONFIG_BT_HCIUART_BCSP=y |
102 | CONFIG_BT_HCIUART_LL=y | 102 | CONFIG_BT_HCIUART_LL=y |
103 | CONFIG_BT_HCIBCM203X=y | 103 | CONFIG_BT_HCIBCM203X=m |
104 | CONFIG_BT_HCIBPA10X=y | 104 | CONFIG_BT_HCIBPA10X=m |
105 | CONFIG_CFG80211=y | 105 | CONFIG_CFG80211=m |
106 | CONFIG_MAC80211=y | 106 | CONFIG_MAC80211=m |
107 | CONFIG_MAC80211_RC_PID=y | 107 | CONFIG_MAC80211_RC_PID=y |
108 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 108 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
109 | CONFIG_MAC80211_LEDS=y | 109 | CONFIG_MAC80211_LEDS=y |
@@ -137,9 +137,11 @@ CONFIG_SMSC_PHY=y | |||
137 | CONFIG_NET_ETHERNET=y | 137 | CONFIG_NET_ETHERNET=y |
138 | CONFIG_SMC91X=y | 138 | CONFIG_SMC91X=y |
139 | CONFIG_SMSC911X=y | 139 | CONFIG_SMSC911X=y |
140 | CONFIG_LIBERTAS=y | 140 | CONFIG_KS8851=y |
141 | CONFIG_LIBERTAS_USB=y | 141 | CONFIG_KS8851_MLL=y |
142 | CONFIG_LIBERTAS_SDIO=y | 142 | CONFIG_LIBERTAS=m |
143 | CONFIG_LIBERTAS_USB=m | ||
144 | CONFIG_LIBERTAS_SDIO=m | ||
143 | CONFIG_LIBERTAS_DEBUG=y | 145 | CONFIG_LIBERTAS_DEBUG=y |
144 | CONFIG_USB_USBNET=y | 146 | CONFIG_USB_USBNET=y |
145 | CONFIG_USB_ALI_M5632=y | 147 | CONFIG_USB_ALI_M5632=y |
@@ -201,8 +203,8 @@ CONFIG_FONTS=y | |||
201 | CONFIG_FONT_8x8=y | 203 | CONFIG_FONT_8x8=y |
202 | CONFIG_FONT_8x16=y | 204 | CONFIG_FONT_8x16=y |
203 | CONFIG_LOGO=y | 205 | CONFIG_LOGO=y |
204 | CONFIG_SOUND=y | 206 | CONFIG_SOUND=m |
205 | CONFIG_SND=y | 207 | CONFIG_SND=m |
206 | CONFIG_SND_MIXER_OSS=y | 208 | CONFIG_SND_MIXER_OSS=y |
207 | CONFIG_SND_PCM_OSS=y | 209 | CONFIG_SND_PCM_OSS=y |
208 | CONFIG_SND_VERBOSE_PRINTK=y | 210 | CONFIG_SND_VERBOSE_PRINTK=y |
@@ -218,9 +220,9 @@ CONFIG_USB_DEVICEFS=y | |||
218 | CONFIG_USB_SUSPEND=y | 220 | CONFIG_USB_SUSPEND=y |
219 | # CONFIG_USB_OTG_WHITELIST is not set | 221 | # CONFIG_USB_OTG_WHITELIST is not set |
220 | CONFIG_USB_MON=y | 222 | CONFIG_USB_MON=y |
221 | CONFIG_USB_MUSB_HDRC=y | 223 | # CONFIG_USB_MUSB_HDRC is not set |
222 | CONFIG_USB_MUSB_OTG=y | 224 | # CONFIG_USB_MUSB_OTG is not set |
223 | CONFIG_USB_GADGET_MUSB_HDRC=y | 225 | # CONFIG_USB_GADGET_MUSB_HDRC is not set |
224 | CONFIG_USB_MUSB_DEBUG=y | 226 | CONFIG_USB_MUSB_DEBUG=y |
225 | CONFIG_USB_WDM=y | 227 | CONFIG_USB_WDM=y |
226 | CONFIG_USB_STORAGE=y | 228 | CONFIG_USB_STORAGE=y |
@@ -276,12 +278,11 @@ CONFIG_DEBUG_KERNEL=y | |||
276 | CONFIG_SCHEDSTATS=y | 278 | CONFIG_SCHEDSTATS=y |
277 | CONFIG_TIMER_STATS=y | 279 | CONFIG_TIMER_STATS=y |
278 | CONFIG_PROVE_LOCKING=y | 280 | CONFIG_PROVE_LOCKING=y |
279 | CONFIG_LOCK_STAT=y | 281 | # CONFIG_LOCK_STAT is not set |
280 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 282 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
281 | # CONFIG_DEBUG_BUGVERBOSE is not set | 283 | # CONFIG_DEBUG_BUGVERBOSE is not set |
282 | CONFIG_DEBUG_INFO=y | 284 | CONFIG_DEBUG_INFO=y |
283 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 285 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
284 | CONFIG_DEBUG_LL=y | ||
285 | CONFIG_SECURITY=y | 286 | CONFIG_SECURITY=y |
286 | CONFIG_CRYPTO_MICHAEL_MIC=y | 287 | CONFIG_CRYPTO_MICHAEL_MIC=y |
287 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 288 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig deleted file mode 100644 index 14c1e18c648f..000000000000 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | ||
3 | CONFIG_BSD_PROCESS_ACCT=y | ||
4 | CONFIG_LOG_BUF_SHIFT=14 | ||
5 | CONFIG_BLK_DEV_INITRD=y | ||
6 | CONFIG_EMBEDDED=y | ||
7 | # CONFIG_SYSCTL_SYSCALL is not set | ||
8 | # CONFIG_ELF_CORE is not set | ||
9 | CONFIG_MODULES=y | ||
10 | CONFIG_MODULE_UNLOAD=y | ||
11 | CONFIG_MODVERSIONS=y | ||
12 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
13 | # CONFIG_BLK_DEV_BSG is not set | ||
14 | CONFIG_ARCH_OMAP=y | ||
15 | CONFIG_ARCH_OMAP4=y | ||
16 | # CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set | ||
17 | # CONFIG_ARCH_OMAP2 is not set | ||
18 | # CONFIG_ARCH_OMAP3 is not set | ||
19 | # CONFIG_OMAP_MUX is not set | ||
20 | CONFIG_OMAP_32K_TIMER=y | ||
21 | CONFIG_OMAP_DM_TIMER=y | ||
22 | CONFIG_MACH_OMAP_4430SDP=y | ||
23 | # CONFIG_ARM_THUMB is not set | ||
24 | CONFIG_PL310_ERRATA_588369=y | ||
25 | CONFIG_SMP=y | ||
26 | CONFIG_NR_CPUS=2 | ||
27 | # CONFIG_LOCAL_TIMERS is not set | ||
28 | CONFIG_PREEMPT=y | ||
29 | CONFIG_AEABI=y | ||
30 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
31 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
32 | CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS2,115200n8 initrd=0x81600000,20M ramdisk_size=20480" | ||
33 | CONFIG_VFP=y | ||
34 | CONFIG_NEON=y | ||
35 | CONFIG_BINFMT_MISC=y | ||
36 | CONFIG_NET=y | ||
37 | CONFIG_PACKET=y | ||
38 | CONFIG_INET=y | ||
39 | CONFIG_IP_PNP=y | ||
40 | CONFIG_IP_PNP_DHCP=y | ||
41 | CONFIG_IP_PNP_BOOTP=y | ||
42 | CONFIG_IP_PNP_RARP=y | ||
43 | # CONFIG_IPV6 is not set | ||
44 | # CONFIG_WIRELESS is not set | ||
45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
46 | # CONFIG_FW_LOADER is not set | ||
47 | CONFIG_BLK_DEV_LOOP=y | ||
48 | CONFIG_BLK_DEV_RAM=y | ||
49 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
50 | # CONFIG_MISC_DEVICES is not set | ||
51 | CONFIG_NETDEVICES=y | ||
52 | CONFIG_NET_ETHERNET=y | ||
53 | CONFIG_KS8851=y | ||
54 | # CONFIG_NETDEV_1000 is not set | ||
55 | # CONFIG_NETDEV_10000 is not set | ||
56 | # CONFIG_WLAN is not set | ||
57 | # CONFIG_INPUT_MOUSEDEV is not set | ||
58 | CONFIG_INPUT_EVDEV=y | ||
59 | # CONFIG_INPUT_KEYBOARD is not set | ||
60 | # CONFIG_INPUT_MOUSE is not set | ||
61 | # CONFIG_SERIO is not set | ||
62 | CONFIG_SERIAL_8250=y | ||
63 | CONFIG_SERIAL_8250_CONSOLE=y | ||
64 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
65 | CONFIG_SERIAL_8250_EXTENDED=y | ||
66 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
67 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
68 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
69 | CONFIG_SERIAL_8250_RSA=y | ||
70 | # CONFIG_LEGACY_PTYS is not set | ||
71 | CONFIG_HW_RANDOM=y | ||
72 | CONFIG_I2C=y | ||
73 | CONFIG_I2C_CHARDEV=y | ||
74 | CONFIG_I2C_OMAP=y | ||
75 | CONFIG_SPI=y | ||
76 | CONFIG_SPI_OMAP24XX=y | ||
77 | # CONFIG_HWMON is not set | ||
78 | CONFIG_WATCHDOG=y | ||
79 | CONFIG_OMAP_WATCHDOG=y | ||
80 | CONFIG_TWL4030_CORE=y | ||
81 | CONFIG_REGULATOR=y | ||
82 | CONFIG_REGULATOR_TWL4030=y | ||
83 | # CONFIG_VGA_CONSOLE is not set | ||
84 | # CONFIG_HID_SUPPORT is not set | ||
85 | # CONFIG_USB_SUPPORT is not set | ||
86 | CONFIG_MMC=y | ||
87 | CONFIG_MMC_OMAP_HS=y | ||
88 | CONFIG_RTC_CLASS=y | ||
89 | CONFIG_RTC_DRV_TWL4030=y | ||
90 | CONFIG_EXT2_FS=y | ||
91 | CONFIG_EXT3_FS=y | ||
92 | # CONFIG_EXT3_FS_XATTR is not set | ||
93 | CONFIG_INOTIFY=y | ||
94 | CONFIG_QUOTA=y | ||
95 | CONFIG_QFMT_V2=y | ||
96 | CONFIG_MSDOS_FS=y | ||
97 | CONFIG_VFAT_FS=y | ||
98 | CONFIG_TMPFS=y | ||
99 | CONFIG_NFS_FS=y | ||
100 | CONFIG_NFS_V3=y | ||
101 | CONFIG_NFS_V3_ACL=y | ||
102 | CONFIG_NFS_V4=y | ||
103 | CONFIG_ROOT_NFS=y | ||
104 | CONFIG_PARTITION_ADVANCED=y | ||
105 | CONFIG_NLS_CODEPAGE_437=y | ||
106 | CONFIG_NLS_ISO8859_1=y | ||
107 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
108 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
109 | CONFIG_MAGIC_SYSRQ=y | ||
110 | CONFIG_DEBUG_KERNEL=y | ||
111 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
112 | CONFIG_DETECT_HUNG_TASK=y | ||
113 | # CONFIG_SCHED_DEBUG is not set | ||
114 | # CONFIG_DEBUG_PREEMPT is not set | ||
115 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
116 | CONFIG_DEBUG_INFO=y | ||
117 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
118 | # CONFIG_FTRACE is not set | ||
119 | # CONFIG_ARM_UNWIND is not set | ||
120 | CONFIG_CRYPTO_ECB=m | ||
121 | CONFIG_CRYPTO_PCBC=m | ||
122 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
123 | CONFIG_CRC_CCITT=y | ||
124 | CONFIG_CRC_T10DIF=y | ||
125 | CONFIG_LIBCRC32C=y | ||
diff --git a/arch/arm/configs/omap_generic_2420_defconfig b/arch/arm/configs/omap_generic_2420_defconfig deleted file mode 100644 index ac08e51180dd..000000000000 --- a/arch/arm/configs/omap_generic_2420_defconfig +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | ||
3 | CONFIG_LOG_BUF_SHIFT=14 | ||
4 | CONFIG_BLK_DEV_INITRD=y | ||
5 | CONFIG_MODULES=y | ||
6 | CONFIG_MODULE_UNLOAD=y | ||
7 | # CONFIG_BLK_DEV_BSG is not set | ||
8 | CONFIG_ARCH_OMAP=y | ||
9 | CONFIG_ARCH_OMAP2=y | ||
10 | # CONFIG_OMAP_MUX is not set | ||
11 | CONFIG_MACH_OMAP_GENERIC=y | ||
12 | CONFIG_ARCH_OMAP2420=y | ||
13 | CONFIG_LEDS=y | ||
14 | CONFIG_ZBOOT_ROM_TEXT=0x10C08000 | ||
15 | CONFIG_ZBOOT_ROM_BSS=0x10200000 | ||
16 | CONFIG_FPE_NWFPE=y | ||
17 | CONFIG_BLK_DEV_RAM=y | ||
18 | CONFIG_INPUT_EVDEV=y | ||
19 | # CONFIG_INPUT_KEYBOARD is not set | ||
20 | # CONFIG_INPUT_MOUSE is not set | ||
21 | CONFIG_SERIAL_8250=y | ||
22 | CONFIG_SERIAL_8250_CONSOLE=y | ||
23 | # CONFIG_LEGACY_PTYS is not set | ||
24 | CONFIG_WATCHDOG=y | ||
25 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
26 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
27 | # CONFIG_VGA_CONSOLE is not set | ||
28 | CONFIG_EXT2_FS=y | ||
29 | CONFIG_EXT2_FS_XATTR=y | ||
30 | CONFIG_INOTIFY=y | ||
31 | CONFIG_ROMFS_FS=y | ||
32 | CONFIG_DEBUG_KERNEL=y | ||
33 | CONFIG_DEBUG_INFO=y | ||
34 | CONFIG_DEBUG_USER=y | ||
35 | CONFIG_DEBUG_ERRORS=y | ||
36 | CONFIG_DEBUG_LL=y | ||
37 | CONFIG_CRC_CCITT=y | ||