aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-09-05 10:34:23 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-09-15 22:09:41 -0400
commit0650f855d2e4b0b9b55f58bdd966a6769a5d2d90 (patch)
treec9ba3f6ddb22552e8a99b1cae59dc8ec21f19d3e /arch
parent75fd32b8ef68adf273c233b34c6b898780d290f2 (diff)
ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM
The imx weim driver is used by some mx27/mx1 boards, so let's enable it by default. Generated this patch by doing: - make imx_v4_v5_defconfig - make menuconfig and manually select CONFIG_IMX_WEIM - make savedefconfig - cp defconfig arch/arm/configs/imx_v4_v5_defconfig ,which results in some additional cleanups. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index a3fb8662ff6c..e688741c89aa 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -21,7 +21,6 @@ CONFIG_ARCH_MULTI_V4T=y
21CONFIG_ARCH_MULTI_V5=y 21CONFIG_ARCH_MULTI_V5=y
22# CONFIG_ARCH_MULTI_V7 is not set 22# CONFIG_ARCH_MULTI_V7 is not set
23CONFIG_ARCH_MXC=y 23CONFIG_ARCH_MXC=y
24CONFIG_MXC_IRQ_PRIOR=y
25CONFIG_MACH_SCB9328=y 24CONFIG_MACH_SCB9328=y
26CONFIG_MACH_APF9328=y 25CONFIG_MACH_APF9328=y
27CONFIG_MACH_MX21ADS=y 26CONFIG_MACH_MX21ADS=y
@@ -38,8 +37,6 @@ CONFIG_PREEMPT=y
38CONFIG_AEABI=y 37CONFIG_AEABI=y
39CONFIG_ZBOOT_ROM_TEXT=0x0 38CONFIG_ZBOOT_ROM_TEXT=0x0
40CONFIG_ZBOOT_ROM_BSS=0x0 39CONFIG_ZBOOT_ROM_BSS=0x0
41CONFIG_FPE_NWFPE=y
42CONFIG_FPE_NWFPE_XP=y
43CONFIG_PM_DEBUG=y 40CONFIG_PM_DEBUG=y
44CONFIG_NET=y 41CONFIG_NET=y
45CONFIG_PACKET=y 42CONFIG_PACKET=y
@@ -58,6 +55,7 @@ CONFIG_NETFILTER=y
58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
59CONFIG_DEVTMPFS=y 56CONFIG_DEVTMPFS=y
60CONFIG_DEVTMPFS_MOUNT=y 57CONFIG_DEVTMPFS_MOUNT=y
58CONFIG_IMX_WEIM=y
61CONFIG_MTD=y 59CONFIG_MTD=y
62CONFIG_MTD_CMDLINE_PARTS=y 60CONFIG_MTD_CMDLINE_PARTS=y
63CONFIG_MTD_BLOCK=y 61CONFIG_MTD_BLOCK=y
@@ -73,8 +71,8 @@ CONFIG_MTD_NAND_MXC=y
73CONFIG_MTD_UBI=y 71CONFIG_MTD_UBI=y
74CONFIG_EEPROM_AT24=y 72CONFIG_EEPROM_AT24=y
75CONFIG_EEPROM_AT25=y 73CONFIG_EEPROM_AT25=y
76CONFIG_ATA=y
77CONFIG_BLK_DEV_SD=y 74CONFIG_BLK_DEV_SD=y
75CONFIG_ATA=y
78CONFIG_PATA_IMX=y 76CONFIG_PATA_IMX=y
79CONFIG_NETDEVICES=y 77CONFIG_NETDEVICES=y
80CONFIG_CS89x0=y 78CONFIG_CS89x0=y
@@ -97,10 +95,8 @@ CONFIG_SERIAL_8250=m
97CONFIG_SERIAL_IMX=y 95CONFIG_SERIAL_IMX=y
98CONFIG_SERIAL_IMX_CONSOLE=y 96CONFIG_SERIAL_IMX_CONSOLE=y
99# CONFIG_HW_RANDOM is not set 97# CONFIG_HW_RANDOM is not set
100CONFIG_I2C=y
101CONFIG_I2C_CHARDEV=y 98CONFIG_I2C_CHARDEV=y
102CONFIG_I2C_IMX=y 99CONFIG_I2C_IMX=y
103CONFIG_SPI=y
104CONFIG_SPI_IMX=y 100CONFIG_SPI_IMX=y
105CONFIG_SPI_SPIDEV=y 101CONFIG_SPI_SPIDEV=y
106CONFIG_GPIO_SYSFS=y 102CONFIG_GPIO_SYSFS=y
@@ -127,10 +123,7 @@ CONFIG_VIDEO_CODA=y
127CONFIG_SOC_CAMERA_OV2640=y 123CONFIG_SOC_CAMERA_OV2640=y
128CONFIG_FB=y 124CONFIG_FB=y
129CONFIG_FB_IMX=y 125CONFIG_FB_IMX=y
130CONFIG_BACKLIGHT_LCD_SUPPORT=y
131CONFIG_LCD_CLASS_DEVICE=y
132CONFIG_LCD_L4F00242T03=y 126CONFIG_LCD_L4F00242T03=y
133CONFIG_BACKLIGHT_CLASS_DEVICE=y
134CONFIG_FRAMEBUFFER_CONSOLE=y 127CONFIG_FRAMEBUFFER_CONSOLE=y
135CONFIG_LOGO=y 128CONFIG_LOGO=y
136CONFIG_SOUND=y 129CONFIG_SOUND=y