diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-09-05 10:34:23 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-15 22:09:41 -0400 |
commit | 0650f855d2e4b0b9b55f58bdd966a6769a5d2d90 (patch) | |
tree | c9ba3f6ddb22552e8a99b1cae59dc8ec21f19d3e /arch | |
parent | 75fd32b8ef68adf273c233b34c6b898780d290f2 (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_defconfig | 11 |
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 | |||
21 | CONFIG_ARCH_MULTI_V5=y | 21 | CONFIG_ARCH_MULTI_V5=y |
22 | # CONFIG_ARCH_MULTI_V7 is not set | 22 | # CONFIG_ARCH_MULTI_V7 is not set |
23 | CONFIG_ARCH_MXC=y | 23 | CONFIG_ARCH_MXC=y |
24 | CONFIG_MXC_IRQ_PRIOR=y | ||
25 | CONFIG_MACH_SCB9328=y | 24 | CONFIG_MACH_SCB9328=y |
26 | CONFIG_MACH_APF9328=y | 25 | CONFIG_MACH_APF9328=y |
27 | CONFIG_MACH_MX21ADS=y | 26 | CONFIG_MACH_MX21ADS=y |
@@ -38,8 +37,6 @@ CONFIG_PREEMPT=y | |||
38 | CONFIG_AEABI=y | 37 | CONFIG_AEABI=y |
39 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 38 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
40 | CONFIG_ZBOOT_ROM_BSS=0x0 | 39 | CONFIG_ZBOOT_ROM_BSS=0x0 |
41 | CONFIG_FPE_NWFPE=y | ||
42 | CONFIG_FPE_NWFPE_XP=y | ||
43 | CONFIG_PM_DEBUG=y | 40 | CONFIG_PM_DEBUG=y |
44 | CONFIG_NET=y | 41 | CONFIG_NET=y |
45 | CONFIG_PACKET=y | 42 | CONFIG_PACKET=y |
@@ -58,6 +55,7 @@ CONFIG_NETFILTER=y | |||
58 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 55 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
59 | CONFIG_DEVTMPFS=y | 56 | CONFIG_DEVTMPFS=y |
60 | CONFIG_DEVTMPFS_MOUNT=y | 57 | CONFIG_DEVTMPFS_MOUNT=y |
58 | CONFIG_IMX_WEIM=y | ||
61 | CONFIG_MTD=y | 59 | CONFIG_MTD=y |
62 | CONFIG_MTD_CMDLINE_PARTS=y | 60 | CONFIG_MTD_CMDLINE_PARTS=y |
63 | CONFIG_MTD_BLOCK=y | 61 | CONFIG_MTD_BLOCK=y |
@@ -73,8 +71,8 @@ CONFIG_MTD_NAND_MXC=y | |||
73 | CONFIG_MTD_UBI=y | 71 | CONFIG_MTD_UBI=y |
74 | CONFIG_EEPROM_AT24=y | 72 | CONFIG_EEPROM_AT24=y |
75 | CONFIG_EEPROM_AT25=y | 73 | CONFIG_EEPROM_AT25=y |
76 | CONFIG_ATA=y | ||
77 | CONFIG_BLK_DEV_SD=y | 74 | CONFIG_BLK_DEV_SD=y |
75 | CONFIG_ATA=y | ||
78 | CONFIG_PATA_IMX=y | 76 | CONFIG_PATA_IMX=y |
79 | CONFIG_NETDEVICES=y | 77 | CONFIG_NETDEVICES=y |
80 | CONFIG_CS89x0=y | 78 | CONFIG_CS89x0=y |
@@ -97,10 +95,8 @@ CONFIG_SERIAL_8250=m | |||
97 | CONFIG_SERIAL_IMX=y | 95 | CONFIG_SERIAL_IMX=y |
98 | CONFIG_SERIAL_IMX_CONSOLE=y | 96 | CONFIG_SERIAL_IMX_CONSOLE=y |
99 | # CONFIG_HW_RANDOM is not set | 97 | # CONFIG_HW_RANDOM is not set |
100 | CONFIG_I2C=y | ||
101 | CONFIG_I2C_CHARDEV=y | 98 | CONFIG_I2C_CHARDEV=y |
102 | CONFIG_I2C_IMX=y | 99 | CONFIG_I2C_IMX=y |
103 | CONFIG_SPI=y | ||
104 | CONFIG_SPI_IMX=y | 100 | CONFIG_SPI_IMX=y |
105 | CONFIG_SPI_SPIDEV=y | 101 | CONFIG_SPI_SPIDEV=y |
106 | CONFIG_GPIO_SYSFS=y | 102 | CONFIG_GPIO_SYSFS=y |
@@ -127,10 +123,7 @@ CONFIG_VIDEO_CODA=y | |||
127 | CONFIG_SOC_CAMERA_OV2640=y | 123 | CONFIG_SOC_CAMERA_OV2640=y |
128 | CONFIG_FB=y | 124 | CONFIG_FB=y |
129 | CONFIG_FB_IMX=y | 125 | CONFIG_FB_IMX=y |
130 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
131 | CONFIG_LCD_CLASS_DEVICE=y | ||
132 | CONFIG_LCD_L4F00242T03=y | 126 | CONFIG_LCD_L4F00242T03=y |
133 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
134 | CONFIG_FRAMEBUFFER_CONSOLE=y | 127 | CONFIG_FRAMEBUFFER_CONSOLE=y |
135 | CONFIG_LOGO=y | 128 | CONFIG_LOGO=y |
136 | CONFIG_SOUND=y | 129 | CONFIG_SOUND=y |