diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-07-28 23:04:15 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-08-22 11:20:46 -0400 |
commit | 077cfef91b43a5994d848a86567c956d955f1e79 (patch) | |
tree | 02453e3c0e06e4db7bd54d4f46c9e012a8269ca6 | |
parent | 547dd1e089db9927ad95cfb525152fec5153cfeb (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_defconfig | 37 |
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 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_KERNEL_LZO=y | 2 | CONFIG_KERNEL_LZO=y |
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
@@ -17,10 +16,8 @@ CONFIG_MODULE_UNLOAD=y | |||
17 | CONFIG_MODVERSIONS=y | 16 | CONFIG_MODVERSIONS=y |
18 | CONFIG_MODULE_SRCVERSION_ALL=y | 17 | CONFIG_MODULE_SRCVERSION_ALL=y |
19 | # CONFIG_BLK_DEV_BSG is not set | 18 | # CONFIG_BLK_DEV_BSG is not set |
20 | CONFIG_ARCH_MXC=y | ||
21 | CONFIG_ARCH_MULTI_V6=y | 19 | CONFIG_ARCH_MULTI_V6=y |
22 | CONFIG_ARCH_MULTI_V7=y | 20 | CONFIG_ARCH_MXC=y |
23 | CONFIG_MACH_IMX31_DT=y | ||
24 | CONFIG_MACH_MX31LILLY=y | 21 | CONFIG_MACH_MX31LILLY=y |
25 | CONFIG_MACH_MX31LITE=y | 22 | CONFIG_MACH_MX31LITE=y |
26 | CONFIG_MACH_PCM037=y | 23 | CONFIG_MACH_PCM037=y |
@@ -30,6 +27,7 @@ CONFIG_MACH_MX31MOBOARD=y | |||
30 | CONFIG_MACH_QONG=y | 27 | CONFIG_MACH_QONG=y |
31 | CONFIG_MACH_ARMADILLO5X0=y | 28 | CONFIG_MACH_ARMADILLO5X0=y |
32 | CONFIG_MACH_KZM_ARM11_01=y | 29 | CONFIG_MACH_KZM_ARM11_01=y |
30 | CONFIG_MACH_IMX31_DT=y | ||
33 | CONFIG_MACH_PCM043=y | 31 | CONFIG_MACH_PCM043=y |
34 | CONFIG_MACH_MX35_3DS=y | 32 | CONFIG_MACH_MX35_3DS=y |
35 | CONFIG_MACH_VPR200=y | 33 | CONFIG_MACH_VPR200=y |
@@ -39,7 +37,6 @@ CONFIG_SOC_IMX53=y | |||
39 | CONFIG_SOC_IMX6Q=y | 37 | CONFIG_SOC_IMX6Q=y |
40 | CONFIG_SOC_IMX6SL=y | 38 | CONFIG_SOC_IMX6SL=y |
41 | CONFIG_SOC_VF610=y | 39 | CONFIG_SOC_VF610=y |
42 | CONFIG_MXC_PWM=y | ||
43 | CONFIG_SMP=y | 40 | CONFIG_SMP=y |
44 | CONFIG_VMSPLIT_2G=y | 41 | CONFIG_VMSPLIT_2G=y |
45 | CONFIG_PREEMPT_VOLUNTARY=y | 42 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -72,7 +69,6 @@ CONFIG_IMX_WEIM=y | |||
72 | CONFIG_CONNECTOR=y | 69 | CONFIG_CONNECTOR=y |
73 | CONFIG_MTD=y | 70 | CONFIG_MTD=y |
74 | CONFIG_MTD_CMDLINE_PARTS=y | 71 | CONFIG_MTD_CMDLINE_PARTS=y |
75 | CONFIG_MTD_CHAR=y | ||
76 | CONFIG_MTD_BLOCK=y | 72 | CONFIG_MTD_BLOCK=y |
77 | CONFIG_MTD_CFI=y | 73 | CONFIG_MTD_CFI=y |
78 | CONFIG_MTD_JEDECPROBE=y | 74 | CONFIG_MTD_JEDECPROBE=y |
@@ -104,7 +100,6 @@ CONFIG_ATA=y | |||
104 | CONFIG_PATA_IMX=y | 100 | CONFIG_PATA_IMX=y |
105 | CONFIG_NETDEVICES=y | 101 | CONFIG_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 | ||
108 | CONFIG_CS89x0=y | 103 | CONFIG_CS89x0=y |
109 | CONFIG_CS89x0_PLATFORM=y | 104 | CONFIG_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 | |||
141 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 136 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
142 | CONFIG_HW_RANDOM=y | 137 | CONFIG_HW_RANDOM=y |
143 | CONFIG_HW_RANDOM_MXC_RNGA=y | 138 | CONFIG_HW_RANDOM_MXC_RNGA=y |
144 | CONFIG_I2C=y | ||
145 | # CONFIG_I2C_COMPAT is not set | 139 | # CONFIG_I2C_COMPAT is not set |
146 | CONFIG_I2C_CHARDEV=y | 140 | CONFIG_I2C_CHARDEV=y |
147 | # CONFIG_I2C_HELPER_AUTO is not set | 141 | # CONFIG_I2C_HELPER_AUTO is not set |
148 | CONFIG_I2C_ALGOBIT=m | ||
149 | CONFIG_I2C_ALGOPCF=m | 142 | CONFIG_I2C_ALGOPCF=m |
150 | CONFIG_I2C_ALGOPCA=m | 143 | CONFIG_I2C_ALGOPCA=m |
151 | CONFIG_I2C_IMX=y | 144 | CONFIG_I2C_IMX=y |
@@ -161,32 +154,26 @@ CONFIG_MFD_MC13XXX_SPI=y | |||
161 | CONFIG_MFD_MC13XXX_I2C=y | 154 | CONFIG_MFD_MC13XXX_I2C=y |
162 | CONFIG_REGULATOR=y | 155 | CONFIG_REGULATOR=y |
163 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 156 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
164 | CONFIG_REGULATOR_DA9052=y | ||
165 | CONFIG_REGULATOR_ANATOP=y | 157 | CONFIG_REGULATOR_ANATOP=y |
158 | CONFIG_REGULATOR_DA9052=y | ||
166 | CONFIG_REGULATOR_MC13783=y | 159 | CONFIG_REGULATOR_MC13783=y |
167 | CONFIG_REGULATOR_MC13892=y | 160 | CONFIG_REGULATOR_MC13892=y |
168 | CONFIG_MEDIA_SUPPORT=y | 161 | CONFIG_MEDIA_SUPPORT=y |
169 | CONFIG_VIDEO_DEV=y | ||
170 | CONFIG_V4L_PLATFORM_DRIVERS=y | ||
171 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 162 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
163 | CONFIG_V4L_PLATFORM_DRIVERS=y | ||
172 | CONFIG_SOC_CAMERA=y | 164 | CONFIG_SOC_CAMERA=y |
173 | CONFIG_SOC_CAMERA_OV2640=y | ||
174 | CONFIG_DRM=y | ||
175 | CONFIG_VIDEO_MX3=y | 165 | CONFIG_VIDEO_MX3=y |
176 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 166 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
177 | CONFIG_VIDEO_CODA=y | 167 | CONFIG_VIDEO_CODA=y |
178 | CONFIG_FB=y | 168 | CONFIG_SOC_CAMERA_OV2640=y |
179 | CONFIG_LCD_PLATFORM=y | 169 | CONFIG_DRM=y |
180 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 170 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
181 | CONFIG_LCD_CLASS_DEVICE=y | 171 | CONFIG_LCD_CLASS_DEVICE=y |
182 | CONFIG_LCD_L4F00242T03=y | 172 | CONFIG_LCD_L4F00242T03=y |
173 | CONFIG_LCD_PLATFORM=y | ||
183 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 174 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
184 | CONFIG_BACKLIGHT_PWM=y | 175 | CONFIG_BACKLIGHT_PWM=y |
185 | CONFIG_FRAMEBUFFER_CONSOLE=y | 176 | CONFIG_FRAMEBUFFER_CONSOLE=y |
186 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
187 | CONFIG_FONTS=y | ||
188 | CONFIG_FONT_8x8=y | ||
189 | CONFIG_FONT_8x16=y | ||
190 | CONFIG_LOGO=y | 177 | CONFIG_LOGO=y |
191 | CONFIG_SOUND=y | 178 | CONFIG_SOUND=y |
192 | CONFIG_SND=y | 179 | CONFIG_SND=y |
@@ -196,16 +183,15 @@ CONFIG_SND_SOC_PHYCORE_AC97=y | |||
196 | CONFIG_SND_SOC_EUKREA_TLV320=y | 183 | CONFIG_SND_SOC_EUKREA_TLV320=y |
197 | CONFIG_SND_SOC_IMX_WM8962=y | 184 | CONFIG_SND_SOC_IMX_WM8962=y |
198 | CONFIG_SND_SOC_IMX_SGTL5000=y | 185 | CONFIG_SND_SOC_IMX_SGTL5000=y |
199 | CONFIG_SND_SOC_IMX_MC13783=y | ||
200 | CONFIG_USB=y | 186 | CONFIG_USB=y |
201 | CONFIG_USB_EHCI_HCD=y | 187 | CONFIG_USB_EHCI_HCD=y |
202 | CONFIG_USB_EHCI_MXC=y | 188 | CONFIG_USB_EHCI_MXC=y |
189 | CONFIG_USB_STORAGE=y | ||
203 | CONFIG_USB_CHIPIDEA=y | 190 | CONFIG_USB_CHIPIDEA=y |
204 | CONFIG_USB_CHIPIDEA_HOST=y | 191 | CONFIG_USB_CHIPIDEA_HOST=y |
205 | CONFIG_USB_PHY=y | 192 | CONFIG_USB_PHY=y |
206 | CONFIG_NOP_USB_XCEIV=y | 193 | CONFIG_NOP_USB_XCEIV=y |
207 | CONFIG_USB_MXS_PHY=y | 194 | CONFIG_USB_MXS_PHY=y |
208 | CONFIG_USB_STORAGE=y | ||
209 | CONFIG_MMC=y | 195 | CONFIG_MMC=y |
210 | CONFIG_MMC_SDHCI=y | 196 | CONFIG_MMC_SDHCI=y |
211 | CONFIG_MMC_SDHCI_PLTFM=y | 197 | CONFIG_MMC_SDHCI_PLTFM=y |
@@ -222,10 +208,10 @@ CONFIG_IMX_SDMA=y | |||
222 | CONFIG_MXS_DMA=y | 208 | CONFIG_MXS_DMA=y |
223 | CONFIG_STAGING=y | 209 | CONFIG_STAGING=y |
224 | CONFIG_DRM_IMX=y | 210 | CONFIG_DRM_IMX=y |
225 | CONFIG_DRM_IMX_TVE=y | ||
226 | CONFIG_DRM_IMX_LDB=y | ||
227 | CONFIG_DRM_IMX_FB_HELPER=y | 211 | CONFIG_DRM_IMX_FB_HELPER=y |
228 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | 212 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y |
213 | CONFIG_DRM_IMX_TVE=y | ||
214 | CONFIG_DRM_IMX_LDB=y | ||
229 | CONFIG_DRM_IMX_IPUV3_CORE=y | 215 | CONFIG_DRM_IMX_IPUV3_CORE=y |
230 | CONFIG_DRM_IMX_IPUV3=y | 216 | CONFIG_DRM_IMX_IPUV3=y |
231 | CONFIG_COMMON_CLK_DEBUG=y | 217 | CONFIG_COMMON_CLK_DEBUG=y |
@@ -279,3 +265,6 @@ CONFIG_CRC_CCITT=m | |||
279 | CONFIG_CRC_T10DIF=y | 265 | CONFIG_CRC_T10DIF=y |
280 | CONFIG_CRC7=m | 266 | CONFIG_CRC7=m |
281 | CONFIG_LIBCRC32C=m | 267 | CONFIG_LIBCRC32C=m |
268 | CONFIG_FONTS=y | ||
269 | CONFIG_FONT_8x8=y | ||
270 | CONFIG_FONT_8x16=y | ||