aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-07-28 23:04:15 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 11:20:46 -0400
commit077cfef91b43a5994d848a86567c956d955f1e79 (patch)
tree02453e3c0e06e4db7bd54d4f46c9e012a8269ca6
parent547dd1e089db9927ad95cfb525152fec5153cfeb (diff)
ARM: imx_v6_v7_defconfig: Cleanup imx_v6_v7_defconfig
Generate imx_v6_v7_defconfig by doing: make savedefconfig cp defconfig arch/arm/configs/imx_v6_v7_defconfig No functional change. The goal here is to cleanup imx_v6_v7_defconfig file to make easier and cleaner the addition of new entries. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig37
1 files changed, 13 insertions, 24 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 9e15992c0463..4570cf73171e 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_KERNEL_LZO=y 2CONFIG_KERNEL_LZO=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -17,10 +16,8 @@ CONFIG_MODULE_UNLOAD=y
17CONFIG_MODVERSIONS=y 16CONFIG_MODVERSIONS=y
18CONFIG_MODULE_SRCVERSION_ALL=y 17CONFIG_MODULE_SRCVERSION_ALL=y
19# CONFIG_BLK_DEV_BSG is not set 18# CONFIG_BLK_DEV_BSG is not set
20CONFIG_ARCH_MXC=y
21CONFIG_ARCH_MULTI_V6=y 19CONFIG_ARCH_MULTI_V6=y
22CONFIG_ARCH_MULTI_V7=y 20CONFIG_ARCH_MXC=y
23CONFIG_MACH_IMX31_DT=y
24CONFIG_MACH_MX31LILLY=y 21CONFIG_MACH_MX31LILLY=y
25CONFIG_MACH_MX31LITE=y 22CONFIG_MACH_MX31LITE=y
26CONFIG_MACH_PCM037=y 23CONFIG_MACH_PCM037=y
@@ -30,6 +27,7 @@ CONFIG_MACH_MX31MOBOARD=y
30CONFIG_MACH_QONG=y 27CONFIG_MACH_QONG=y
31CONFIG_MACH_ARMADILLO5X0=y 28CONFIG_MACH_ARMADILLO5X0=y
32CONFIG_MACH_KZM_ARM11_01=y 29CONFIG_MACH_KZM_ARM11_01=y
30CONFIG_MACH_IMX31_DT=y
33CONFIG_MACH_PCM043=y 31CONFIG_MACH_PCM043=y
34CONFIG_MACH_MX35_3DS=y 32CONFIG_MACH_MX35_3DS=y
35CONFIG_MACH_VPR200=y 33CONFIG_MACH_VPR200=y
@@ -39,7 +37,6 @@ CONFIG_SOC_IMX53=y
39CONFIG_SOC_IMX6Q=y 37CONFIG_SOC_IMX6Q=y
40CONFIG_SOC_IMX6SL=y 38CONFIG_SOC_IMX6SL=y
41CONFIG_SOC_VF610=y 39CONFIG_SOC_VF610=y
42CONFIG_MXC_PWM=y
43CONFIG_SMP=y 40CONFIG_SMP=y
44CONFIG_VMSPLIT_2G=y 41CONFIG_VMSPLIT_2G=y
45CONFIG_PREEMPT_VOLUNTARY=y 42CONFIG_PREEMPT_VOLUNTARY=y
@@ -72,7 +69,6 @@ CONFIG_IMX_WEIM=y
72CONFIG_CONNECTOR=y 69CONFIG_CONNECTOR=y
73CONFIG_MTD=y 70CONFIG_MTD=y
74CONFIG_MTD_CMDLINE_PARTS=y 71CONFIG_MTD_CMDLINE_PARTS=y
75CONFIG_MTD_CHAR=y
76CONFIG_MTD_BLOCK=y 72CONFIG_MTD_BLOCK=y
77CONFIG_MTD_CFI=y 73CONFIG_MTD_CFI=y
78CONFIG_MTD_JEDECPROBE=y 74CONFIG_MTD_JEDECPROBE=y
@@ -104,7 +100,6 @@ CONFIG_ATA=y
104CONFIG_PATA_IMX=y 100CONFIG_PATA_IMX=y
105CONFIG_NETDEVICES=y 101CONFIG_NETDEVICES=y
106# CONFIG_NET_VENDOR_BROADCOM is not set 102# CONFIG_NET_VENDOR_BROADCOM is not set
107# CONFIG_NET_VENDOR_CHELSIO is not set
108CONFIG_CS89x0=y 103CONFIG_CS89x0=y
109CONFIG_CS89x0_PLATFORM=y 104CONFIG_CS89x0_PLATFORM=y
110# CONFIG_NET_VENDOR_FARADAY is not set 105# CONFIG_NET_VENDOR_FARADAY is not set
@@ -141,11 +136,9 @@ CONFIG_SERIAL_FSL_LPUART=y
141CONFIG_SERIAL_FSL_LPUART_CONSOLE=y 136CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
142CONFIG_HW_RANDOM=y 137CONFIG_HW_RANDOM=y
143CONFIG_HW_RANDOM_MXC_RNGA=y 138CONFIG_HW_RANDOM_MXC_RNGA=y
144CONFIG_I2C=y
145# CONFIG_I2C_COMPAT is not set 139# CONFIG_I2C_COMPAT is not set
146CONFIG_I2C_CHARDEV=y 140CONFIG_I2C_CHARDEV=y
147# CONFIG_I2C_HELPER_AUTO is not set 141# CONFIG_I2C_HELPER_AUTO is not set
148CONFIG_I2C_ALGOBIT=m
149CONFIG_I2C_ALGOPCF=m 142CONFIG_I2C_ALGOPCF=m
150CONFIG_I2C_ALGOPCA=m 143CONFIG_I2C_ALGOPCA=m
151CONFIG_I2C_IMX=y 144CONFIG_I2C_IMX=y
@@ -161,32 +154,26 @@ CONFIG_MFD_MC13XXX_SPI=y
161CONFIG_MFD_MC13XXX_I2C=y 154CONFIG_MFD_MC13XXX_I2C=y
162CONFIG_REGULATOR=y 155CONFIG_REGULATOR=y
163CONFIG_REGULATOR_FIXED_VOLTAGE=y 156CONFIG_REGULATOR_FIXED_VOLTAGE=y
164CONFIG_REGULATOR_DA9052=y
165CONFIG_REGULATOR_ANATOP=y 157CONFIG_REGULATOR_ANATOP=y
158CONFIG_REGULATOR_DA9052=y
166CONFIG_REGULATOR_MC13783=y 159CONFIG_REGULATOR_MC13783=y
167CONFIG_REGULATOR_MC13892=y 160CONFIG_REGULATOR_MC13892=y
168CONFIG_MEDIA_SUPPORT=y 161CONFIG_MEDIA_SUPPORT=y
169CONFIG_VIDEO_DEV=y
170CONFIG_V4L_PLATFORM_DRIVERS=y
171CONFIG_MEDIA_CAMERA_SUPPORT=y 162CONFIG_MEDIA_CAMERA_SUPPORT=y
163CONFIG_V4L_PLATFORM_DRIVERS=y
172CONFIG_SOC_CAMERA=y 164CONFIG_SOC_CAMERA=y
173CONFIG_SOC_CAMERA_OV2640=y
174CONFIG_DRM=y
175CONFIG_VIDEO_MX3=y 165CONFIG_VIDEO_MX3=y
176CONFIG_V4L_MEM2MEM_DRIVERS=y 166CONFIG_V4L_MEM2MEM_DRIVERS=y
177CONFIG_VIDEO_CODA=y 167CONFIG_VIDEO_CODA=y
178CONFIG_FB=y 168CONFIG_SOC_CAMERA_OV2640=y
179CONFIG_LCD_PLATFORM=y 169CONFIG_DRM=y
180CONFIG_BACKLIGHT_LCD_SUPPORT=y 170CONFIG_BACKLIGHT_LCD_SUPPORT=y
181CONFIG_LCD_CLASS_DEVICE=y 171CONFIG_LCD_CLASS_DEVICE=y
182CONFIG_LCD_L4F00242T03=y 172CONFIG_LCD_L4F00242T03=y
173CONFIG_LCD_PLATFORM=y
183CONFIG_BACKLIGHT_CLASS_DEVICE=y 174CONFIG_BACKLIGHT_CLASS_DEVICE=y
184CONFIG_BACKLIGHT_PWM=y 175CONFIG_BACKLIGHT_PWM=y
185CONFIG_FRAMEBUFFER_CONSOLE=y 176CONFIG_FRAMEBUFFER_CONSOLE=y
186CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
187CONFIG_FONTS=y
188CONFIG_FONT_8x8=y
189CONFIG_FONT_8x16=y
190CONFIG_LOGO=y 177CONFIG_LOGO=y
191CONFIG_SOUND=y 178CONFIG_SOUND=y
192CONFIG_SND=y 179CONFIG_SND=y
@@ -196,16 +183,15 @@ CONFIG_SND_SOC_PHYCORE_AC97=y
196CONFIG_SND_SOC_EUKREA_TLV320=y 183CONFIG_SND_SOC_EUKREA_TLV320=y
197CONFIG_SND_SOC_IMX_WM8962=y 184CONFIG_SND_SOC_IMX_WM8962=y
198CONFIG_SND_SOC_IMX_SGTL5000=y 185CONFIG_SND_SOC_IMX_SGTL5000=y
199CONFIG_SND_SOC_IMX_MC13783=y
200CONFIG_USB=y 186CONFIG_USB=y
201CONFIG_USB_EHCI_HCD=y 187CONFIG_USB_EHCI_HCD=y
202CONFIG_USB_EHCI_MXC=y 188CONFIG_USB_EHCI_MXC=y
189CONFIG_USB_STORAGE=y
203CONFIG_USB_CHIPIDEA=y 190CONFIG_USB_CHIPIDEA=y
204CONFIG_USB_CHIPIDEA_HOST=y 191CONFIG_USB_CHIPIDEA_HOST=y
205CONFIG_USB_PHY=y 192CONFIG_USB_PHY=y
206CONFIG_NOP_USB_XCEIV=y 193CONFIG_NOP_USB_XCEIV=y
207CONFIG_USB_MXS_PHY=y 194CONFIG_USB_MXS_PHY=y
208CONFIG_USB_STORAGE=y
209CONFIG_MMC=y 195CONFIG_MMC=y
210CONFIG_MMC_SDHCI=y 196CONFIG_MMC_SDHCI=y
211CONFIG_MMC_SDHCI_PLTFM=y 197CONFIG_MMC_SDHCI_PLTFM=y
@@ -222,10 +208,10 @@ CONFIG_IMX_SDMA=y
222CONFIG_MXS_DMA=y 208CONFIG_MXS_DMA=y
223CONFIG_STAGING=y 209CONFIG_STAGING=y
224CONFIG_DRM_IMX=y 210CONFIG_DRM_IMX=y
225CONFIG_DRM_IMX_TVE=y
226CONFIG_DRM_IMX_LDB=y
227CONFIG_DRM_IMX_FB_HELPER=y 211CONFIG_DRM_IMX_FB_HELPER=y
228CONFIG_DRM_IMX_PARALLEL_DISPLAY=y 212CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
213CONFIG_DRM_IMX_TVE=y
214CONFIG_DRM_IMX_LDB=y
229CONFIG_DRM_IMX_IPUV3_CORE=y 215CONFIG_DRM_IMX_IPUV3_CORE=y
230CONFIG_DRM_IMX_IPUV3=y 216CONFIG_DRM_IMX_IPUV3=y
231CONFIG_COMMON_CLK_DEBUG=y 217CONFIG_COMMON_CLK_DEBUG=y
@@ -279,3 +265,6 @@ CONFIG_CRC_CCITT=m
279CONFIG_CRC_T10DIF=y 265CONFIG_CRC_T10DIF=y
280CONFIG_CRC7=m 266CONFIG_CRC7=m
281CONFIG_LIBCRC32C=m 267CONFIG_LIBCRC32C=m
268CONFIG_FONTS=y
269CONFIG_FONT_8x8=y
270CONFIG_FONT_8x16=y