diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:05:43 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:05:43 -0400 |
commit | 0bbc298d14f89c16d6839a65bc5cc977c426492d (patch) | |
tree | 5695db6546b525cbe658f7ff9a41115eb6847aac | |
parent | 4e1361100e79a65c36783929bf9df2be1be95b03 (diff) | |
parent | 1463602ce7d07c22f18459e68c7d5c9a8b8ba7de (diff) |
Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
From Shawn Guo <shawn.guo@linaro.org>:
* 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
ARM: mxs_defconfig: Enable RTC driver
ARM: mxs_defconfig: Let AUART driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs: Let GPMI driver be built by default
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 5406c23a02e3..ccdb6357fb74 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
@@ -28,6 +28,7 @@ CONFIG_MACH_MX28EVK=y | |||
28 | CONFIG_MACH_STMP378X_DEVB=y | 28 | CONFIG_MACH_STMP378X_DEVB=y |
29 | CONFIG_MACH_TX28=y | 29 | CONFIG_MACH_TX28=y |
30 | CONFIG_MACH_M28EVK=y | 30 | CONFIG_MACH_M28EVK=y |
31 | CONFIG_MACH_APX4DEVKIT=y | ||
31 | # CONFIG_ARM_THUMB is not set | 32 | # CONFIG_ARM_THUMB is not set |
32 | CONFIG_NO_HZ=y | 33 | CONFIG_NO_HZ=y |
33 | CONFIG_HIGH_RES_TIMERS=y | 34 | CONFIG_HIGH_RES_TIMERS=y |
@@ -58,6 +59,9 @@ CONFIG_CAN_FLEXCAN=m | |||
58 | CONFIG_DEVTMPFS=y | 59 | CONFIG_DEVTMPFS=y |
59 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 60 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
60 | # CONFIG_BLK_DEV is not set | 61 | # CONFIG_BLK_DEV is not set |
62 | CONFIG_MTD=y | ||
63 | CONFIG_MTD_NAND=y | ||
64 | CONFIG_MTD_NAND_GPMI_NAND=y | ||
61 | CONFIG_NETDEVICES=y | 65 | CONFIG_NETDEVICES=y |
62 | CONFIG_NET_ETHERNET=y | 66 | CONFIG_NET_ETHERNET=y |
63 | CONFIG_ENC28J60=y | 67 | CONFIG_ENC28J60=y |
@@ -77,6 +81,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y | |||
77 | # CONFIG_DEVKMEM is not set | 81 | # CONFIG_DEVKMEM is not set |
78 | CONFIG_SERIAL_AMBA_PL011=y | 82 | CONFIG_SERIAL_AMBA_PL011=y |
79 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 83 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
84 | CONFIG_SERIAL_MXS_AUART=y | ||
80 | # CONFIG_HW_RANDOM is not set | 85 | # CONFIG_HW_RANDOM is not set |
81 | CONFIG_I2C=y | 86 | CONFIG_I2C=y |
82 | # CONFIG_I2C_COMPAT is not set | 87 | # CONFIG_I2C_COMPAT is not set |
@@ -109,8 +114,10 @@ CONFIG_MMC=y | |||
109 | CONFIG_MMC_MXS=y | 114 | CONFIG_MMC_MXS=y |
110 | CONFIG_RTC_CLASS=y | 115 | CONFIG_RTC_CLASS=y |
111 | CONFIG_RTC_DRV_DS1307=m | 116 | CONFIG_RTC_DRV_DS1307=m |
117 | CONFIG_RTC_DRV_STMP=y | ||
112 | CONFIG_DMADEVICES=y | 118 | CONFIG_DMADEVICES=y |
113 | CONFIG_MXS_DMA=y | 119 | CONFIG_MXS_DMA=y |
120 | CONFIG_COMMON_CLK_DEBUG=y | ||
114 | CONFIG_EXT3_FS=y | 121 | CONFIG_EXT3_FS=y |
115 | # CONFIG_DNOTIFY is not set | 122 | # CONFIG_DNOTIFY is not set |
116 | CONFIG_FSCACHE=m | 123 | CONFIG_FSCACHE=m |