diff options
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 3a4fb2e5fc6..3cd60690517 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -5,6 +5,7 @@ CONFIG_SYSVIPC=y | |||
5 | CONFIG_LOG_BUF_SHIFT=18 | 5 | CONFIG_LOG_BUF_SHIFT=18 |
6 | CONFIG_CGROUPS=y | 6 | CONFIG_CGROUPS=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_RELAY=y |
8 | CONFIG_BLK_DEV_INITRD=y | ||
8 | CONFIG_EXPERT=y | 9 | CONFIG_EXPERT=y |
9 | # CONFIG_SLUB_DEBUG is not set | 10 | # CONFIG_SLUB_DEBUG is not set |
10 | # CONFIG_COMPAT_BRK is not set | 11 | # CONFIG_COMPAT_BRK is not set |
@@ -12,7 +13,6 @@ CONFIG_MODULES=y | |||
12 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_MODVERSIONS=y | 14 | CONFIG_MODVERSIONS=y |
14 | CONFIG_MODULE_SRCVERSION_ALL=y | 15 | CONFIG_MODULE_SRCVERSION_ALL=y |
15 | # CONFIG_LBDAF is not set | ||
16 | # CONFIG_BLK_DEV_BSG is not set | 16 | # CONFIG_BLK_DEV_BSG is not set |
17 | CONFIG_ARCH_MXC=y | 17 | CONFIG_ARCH_MXC=y |
18 | CONFIG_MACH_MX31LILLY=y | 18 | CONFIG_MACH_MX31LILLY=y |
@@ -26,7 +26,6 @@ CONFIG_MACH_ARMADILLO5X0=y | |||
26 | CONFIG_MACH_KZM_ARM11_01=y | 26 | CONFIG_MACH_KZM_ARM11_01=y |
27 | CONFIG_MACH_PCM043=y | 27 | CONFIG_MACH_PCM043=y |
28 | CONFIG_MACH_MX35_3DS=y | 28 | CONFIG_MACH_MX35_3DS=y |
29 | CONFIG_MACH_EUKREA_CPUIMX35=y | ||
30 | CONFIG_MACH_VPR200=y | 29 | CONFIG_MACH_VPR200=y |
31 | CONFIG_MACH_IMX51_DT=y | 30 | CONFIG_MACH_IMX51_DT=y |
32 | CONFIG_MACH_MX51_3DS=y | 31 | CONFIG_MACH_MX51_3DS=y |
@@ -83,7 +82,6 @@ CONFIG_NETDEVICES=y | |||
83 | # CONFIG_NET_VENDOR_BROADCOM is not set | 82 | # CONFIG_NET_VENDOR_BROADCOM is not set |
84 | # CONFIG_NET_VENDOR_CHELSIO is not set | 83 | # CONFIG_NET_VENDOR_CHELSIO is not set |
85 | # CONFIG_NET_VENDOR_FARADAY is not set | 84 | # CONFIG_NET_VENDOR_FARADAY is not set |
86 | CONFIG_FEC=y | ||
87 | # CONFIG_NET_VENDOR_INTEL is not set | 85 | # CONFIG_NET_VENDOR_INTEL is not set |
88 | # CONFIG_NET_VENDOR_MARVELL is not set | 86 | # CONFIG_NET_VENDOR_MARVELL is not set |
89 | # CONFIG_NET_VENDOR_MICREL is not set | 87 | # CONFIG_NET_VENDOR_MICREL is not set |
@@ -126,6 +124,7 @@ CONFIG_WATCHDOG=y | |||
126 | CONFIG_IMX2_WDT=y | 124 | CONFIG_IMX2_WDT=y |
127 | CONFIG_MFD_MC13XXX=y | 125 | CONFIG_MFD_MC13XXX=y |
128 | CONFIG_REGULATOR=y | 126 | CONFIG_REGULATOR=y |
127 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
129 | CONFIG_REGULATOR_MC13892=y | 128 | CONFIG_REGULATOR_MC13892=y |
130 | CONFIG_USB=y | 129 | CONFIG_USB=y |
131 | CONFIG_USB_EHCI_HCD=y | 130 | CONFIG_USB_EHCI_HCD=y |