diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-09-21 04:46:15 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-09-27 06:53:06 -0400 |
commit | 6470310865dc8d7ed78f0df8f4c7f7e39c7bab99 (patch) | |
tree | 8578eed271846ff44d1d9a8698605ddb27c6b2a7 /arch/arm/configs | |
parent | ea9a9b2ba239792be57d8601f57a4971958ebad5 (diff) |
ARM: mx51_defconfig: add new boards MACH_MX51_3DS and MACH_EUKREA_CPUIMX51
Further remove FIXED_PHY as it breaks the ethernet.
VGA_CONSOLE isn't selectable anymore since fb78b51cb11e.
EXT3_DEFAULTS_TO_ORDERED defaults to y since aa32a796389b.
INOTIFY is gone since 2dfc1cae4c42.
CONFIG_DETECT_SOFTLOCKUP is gone since e16bb1d7fe07.
Enable TMPFS for udev.
KEYS is selected by NFS_USE_KERNEL_DNS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/mx51_defconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index a665ecbbe2bc..163cfee7644c 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig | |||
@@ -15,6 +15,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
15 | CONFIG_ARCH_MXC=y | 15 | CONFIG_ARCH_MXC=y |
16 | CONFIG_ARCH_MX5=y | 16 | CONFIG_ARCH_MX5=y |
17 | CONFIG_MACH_MX51_BABBAGE=y | 17 | CONFIG_MACH_MX51_BABBAGE=y |
18 | CONFIG_MACH_MX51_3DS=y | ||
19 | CONFIG_MACH_EUKREA_CPUIMX51=y | ||
18 | CONFIG_NO_HZ=y | 20 | CONFIG_NO_HZ=y |
19 | CONFIG_HIGH_RES_TIMERS=y | 21 | CONFIG_HIGH_RES_TIMERS=y |
20 | CONFIG_PREEMPT_VOLUNTARY=y | 22 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -69,7 +71,6 @@ CONFIG_REALTEK_PHY=y | |||
69 | CONFIG_NATIONAL_PHY=y | 71 | CONFIG_NATIONAL_PHY=y |
70 | CONFIG_STE10XP=y | 72 | CONFIG_STE10XP=y |
71 | CONFIG_LSI_ET1011C_PHY=y | 73 | CONFIG_LSI_ET1011C_PHY=y |
72 | CONFIG_FIXED_PHY=y | ||
73 | CONFIG_MDIO_BITBANG=y | 74 | CONFIG_MDIO_BITBANG=y |
74 | CONFIG_MDIO_GPIO=y | 75 | CONFIG_MDIO_GPIO=y |
75 | CONFIG_NET_ETHERNET=y | 76 | CONFIG_NET_ETHERNET=y |
@@ -100,7 +101,6 @@ CONFIG_I2C_ALGOPCF=m | |||
100 | CONFIG_I2C_ALGOPCA=m | 101 | CONFIG_I2C_ALGOPCA=m |
101 | CONFIG_GPIO_SYSFS=y | 102 | CONFIG_GPIO_SYSFS=y |
102 | # CONFIG_HWMON is not set | 103 | # CONFIG_HWMON is not set |
103 | # CONFIG_VGA_CONSOLE is not set | ||
104 | # CONFIG_HID_SUPPORT is not set | 104 | # CONFIG_HID_SUPPORT is not set |
105 | CONFIG_USB=y | 105 | CONFIG_USB=y |
106 | CONFIG_USB_EHCI_HCD=y | 106 | CONFIG_USB_EHCI_HCD=y |
@@ -117,13 +117,11 @@ CONFIG_EXT2_FS_XATTR=y | |||
117 | CONFIG_EXT2_FS_POSIX_ACL=y | 117 | CONFIG_EXT2_FS_POSIX_ACL=y |
118 | CONFIG_EXT2_FS_SECURITY=y | 118 | CONFIG_EXT2_FS_SECURITY=y |
119 | CONFIG_EXT3_FS=y | 119 | CONFIG_EXT3_FS=y |
120 | CONFIG_EXT3_DEFAULTS_TO_ORDERED=y | ||
121 | CONFIG_EXT3_FS_POSIX_ACL=y | 120 | CONFIG_EXT3_FS_POSIX_ACL=y |
122 | CONFIG_EXT3_FS_SECURITY=y | 121 | CONFIG_EXT3_FS_SECURITY=y |
123 | CONFIG_EXT4_FS=y | 122 | CONFIG_EXT4_FS=y |
124 | CONFIG_EXT4_FS_POSIX_ACL=y | 123 | CONFIG_EXT4_FS_POSIX_ACL=y |
125 | CONFIG_EXT4_FS_SECURITY=y | 124 | CONFIG_EXT4_FS_SECURITY=y |
126 | CONFIG_INOTIFY=y | ||
127 | CONFIG_QUOTA=y | 125 | CONFIG_QUOTA=y |
128 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 126 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
129 | # CONFIG_PRINT_QUOTA_WARNING is not set | 127 | # CONFIG_PRINT_QUOTA_WARNING is not set |
@@ -136,6 +134,7 @@ CONFIG_ZISOFS=y | |||
136 | CONFIG_UDF_FS=m | 134 | CONFIG_UDF_FS=m |
137 | CONFIG_MSDOS_FS=m | 135 | CONFIG_MSDOS_FS=m |
138 | CONFIG_VFAT_FS=y | 136 | CONFIG_VFAT_FS=y |
137 | CONFIG_TMPFS=y | ||
139 | CONFIG_CONFIGFS_FS=m | 138 | CONFIG_CONFIGFS_FS=m |
140 | CONFIG_NFS_FS=y | 139 | CONFIG_NFS_FS=y |
141 | CONFIG_NFS_V3=y | 140 | CONFIG_NFS_V3=y |
@@ -151,7 +150,6 @@ CONFIG_NLS_UTF8=y | |||
151 | CONFIG_MAGIC_SYSRQ=y | 150 | CONFIG_MAGIC_SYSRQ=y |
152 | CONFIG_DEBUG_FS=y | 151 | CONFIG_DEBUG_FS=y |
153 | CONFIG_DEBUG_KERNEL=y | 152 | CONFIG_DEBUG_KERNEL=y |
154 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
155 | # CONFIG_SCHED_DEBUG is not set | 153 | # CONFIG_SCHED_DEBUG is not set |
156 | # CONFIG_DEBUG_BUGVERBOSE is not set | 154 | # CONFIG_DEBUG_BUGVERBOSE is not set |
157 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 155 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -159,7 +157,6 @@ CONFIG_DEBUG_KERNEL=y | |||
159 | # CONFIG_ARM_UNWIND is not set | 157 | # CONFIG_ARM_UNWIND is not set |
160 | CONFIG_DEBUG_LL=y | 158 | CONFIG_DEBUG_LL=y |
161 | CONFIG_EARLY_PRINTK=y | 159 | CONFIG_EARLY_PRINTK=y |
162 | CONFIG_KEYS=y | ||
163 | CONFIG_SECURITYFS=y | 160 | CONFIG_SECURITYFS=y |
164 | CONFIG_CRYPTO_DEFLATE=y | 161 | CONFIG_CRYPTO_DEFLATE=y |
165 | CONFIG_CRYPTO_LZO=y | 162 | CONFIG_CRYPTO_LZO=y |