Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig

ARM i.MX defconfig updates for 3.5

* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v6_v7_defconfig: Add SPI NOR support
  ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
Arnd Bergmann 13 years ago
parent
66f75a5d02 d86a348054
commit
473a37e863
2 changed files with 7 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      arch/arm/configs/imx_v4_v5_defconfig
  2. 6 0
      arch/arm/configs/imx_v6_v7_defconfig

+ 1 - 0
arch/arm/configs/imx_v4_v5_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_MACH_IMX27LITE=y
 
 CONFIG_MACH_PCA100=y
 
 CONFIG_MACH_MXT_TD60=y
 
 CONFIG_MACH_IMX27IPCAM=y
 
+CONFIG_MACH_IMX27_DT=y
 
 CONFIG_MXC_IRQ_PRIOR=y
 
 CONFIG_MXC_PWM=y
 
 CONFIG_NO_HZ=y

+ 6 - 0
arch/arm/configs/imx_v6_v7_defconfig
View File 

@@ -64,6 +64,12 @@ CONFIG_IPV6=y
 
 # CONFIG_WIRELESS is not set
 
 CONFIG_DEVTMPFS=y
 
 CONFIG_DEVTMPFS_MOUNT=y
 
+CONFIG_MTD=y
 
+CONFIG_MTD_OF_PARTS=y
 
+CONFIG_MTD_CHAR=y
 
+CONFIG_MTD_DATAFLASH=y
 
+CONFIG_MTD_M25P80=y
 
+CONFIG_MTD_SST25L=y
 
 # CONFIG_STANDALONE is not set
 
 CONFIG_CONNECTOR=y
 
 CONFIG_BLK_DEV_LOOP=y