diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-09-09 22:40:41 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-15 22:09:43 -0400 |
commit | 64546e9fe3a5b8cf62c946521c71d0532d399850 (patch) | |
tree | 08c93a0613056f70735d07e5537dc0c10323a4fe /arch | |
parent | 0650f855d2e4b0b9b55f58bdd966a6769a5d2d90 (diff) |
ARM: imx_v6_v7_defconfig updates
The rtc isl1208 driver is used by mx6 nitrogen board, so let's enable it by
default.
The fsl sai driver is used by the vf610-twr board, so let's enable it by
default.
simple-audio-card driver is used by the vf610-twr board, so let's enable it by
default.
Generated this patch by doing:
- make imx_v6_v7_defconfig
- make menuconfig and manually select options
- make savedefconfig
- cp defconfig arch/arm/configs/imx_v6_v7_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_v6_v7_defconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 16cfec4385c8..8fca6e276b69 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -32,8 +32,8 @@ CONFIG_MACH_IMX35_DT=y | |||
32 | CONFIG_MACH_PCM043=y | 32 | CONFIG_MACH_PCM043=y |
33 | CONFIG_MACH_MX35_3DS=y | 33 | CONFIG_MACH_MX35_3DS=y |
34 | CONFIG_MACH_VPR200=y | 34 | CONFIG_MACH_VPR200=y |
35 | CONFIG_SOC_IMX51=y | ||
36 | CONFIG_SOC_IMX50=y | 35 | CONFIG_SOC_IMX50=y |
36 | CONFIG_SOC_IMX51=y | ||
37 | CONFIG_SOC_IMX53=y | 37 | CONFIG_SOC_IMX53=y |
38 | CONFIG_SOC_IMX6Q=y | 38 | CONFIG_SOC_IMX6Q=y |
39 | CONFIG_SOC_IMX6SL=y | 39 | CONFIG_SOC_IMX6SL=y |
@@ -105,7 +105,6 @@ CONFIG_EEPROM_AT24=y | |||
105 | CONFIG_EEPROM_AT25=y | 105 | CONFIG_EEPROM_AT25=y |
106 | # CONFIG_SCSI_PROC_FS is not set | 106 | # CONFIG_SCSI_PROC_FS is not set |
107 | CONFIG_BLK_DEV_SD=y | 107 | CONFIG_BLK_DEV_SD=y |
108 | CONFIG_SCSI_MULTI_LUN=y | ||
109 | CONFIG_SCSI_CONSTANTS=y | 108 | CONFIG_SCSI_CONSTANTS=y |
110 | CONFIG_SCSI_LOGGING=y | 109 | CONFIG_SCSI_LOGGING=y |
111 | CONFIG_SCSI_SCAN_ASYNC=y | 110 | CONFIG_SCSI_SCAN_ASYNC=y |
@@ -153,14 +152,12 @@ CONFIG_SERIAL_IMX_CONSOLE=y | |||
153 | CONFIG_SERIAL_FSL_LPUART=y | 152 | CONFIG_SERIAL_FSL_LPUART=y |
154 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 153 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
155 | CONFIG_HW_RANDOM=y | 154 | CONFIG_HW_RANDOM=y |
156 | CONFIG_HW_RANDOM_MXC_RNGA=y | ||
157 | # CONFIG_I2C_COMPAT is not set | 155 | # CONFIG_I2C_COMPAT is not set |
158 | CONFIG_I2C_CHARDEV=y | 156 | CONFIG_I2C_CHARDEV=y |
159 | # CONFIG_I2C_HELPER_AUTO is not set | 157 | # CONFIG_I2C_HELPER_AUTO is not set |
160 | CONFIG_I2C_ALGOPCF=m | 158 | CONFIG_I2C_ALGOPCF=m |
161 | CONFIG_I2C_ALGOPCA=m | 159 | CONFIG_I2C_ALGOPCA=m |
162 | CONFIG_I2C_IMX=y | 160 | CONFIG_I2C_IMX=y |
163 | CONFIG_SPI=y | ||
164 | CONFIG_SPI_IMX=y | 161 | CONFIG_SPI_IMX=y |
165 | CONFIG_GPIO_SYSFS=y | 162 | CONFIG_GPIO_SYSFS=y |
166 | CONFIG_GPIO_MC9S08DZ60=y | 163 | CONFIG_GPIO_MC9S08DZ60=y |
@@ -198,7 +195,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
198 | CONFIG_LCD_CLASS_DEVICE=y | 195 | CONFIG_LCD_CLASS_DEVICE=y |
199 | CONFIG_LCD_L4F00242T03=y | 196 | CONFIG_LCD_L4F00242T03=y |
200 | CONFIG_LCD_PLATFORM=y | 197 | CONFIG_LCD_PLATFORM=y |
201 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
202 | CONFIG_BACKLIGHT_PWM=y | 198 | CONFIG_BACKLIGHT_PWM=y |
203 | CONFIG_BACKLIGHT_GPIO=y | 199 | CONFIG_BACKLIGHT_GPIO=y |
204 | CONFIG_FRAMEBUFFER_CONSOLE=y | 200 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -206,6 +202,7 @@ CONFIG_LOGO=y | |||
206 | CONFIG_SOUND=y | 202 | CONFIG_SOUND=y |
207 | CONFIG_SND=y | 203 | CONFIG_SND=y |
208 | CONFIG_SND_SOC=y | 204 | CONFIG_SND_SOC=y |
205 | CONFIG_SND_SOC_FSL_SAI=y | ||
209 | CONFIG_SND_IMX_SOC=y | 206 | CONFIG_SND_IMX_SOC=y |
210 | CONFIG_SND_SOC_PHYCORE_AC97=y | 207 | CONFIG_SND_SOC_PHYCORE_AC97=y |
211 | CONFIG_SND_SOC_EUKREA_TLV320=y | 208 | CONFIG_SND_SOC_EUKREA_TLV320=y |
@@ -213,6 +210,7 @@ CONFIG_SND_SOC_IMX_WM8962=y | |||
213 | CONFIG_SND_SOC_IMX_SGTL5000=y | 210 | CONFIG_SND_SOC_IMX_SGTL5000=y |
214 | CONFIG_SND_SOC_IMX_SPDIF=y | 211 | CONFIG_SND_SOC_IMX_SPDIF=y |
215 | CONFIG_SND_SOC_IMX_MC13783=y | 212 | CONFIG_SND_SOC_IMX_MC13783=y |
213 | CONFIG_SND_SIMPLE_CARD=y | ||
216 | CONFIG_USB=y | 214 | CONFIG_USB=y |
217 | CONFIG_USB_EHCI_HCD=y | 215 | CONFIG_USB_EHCI_HCD=y |
218 | CONFIG_USB_EHCI_MXC=y | 216 | CONFIG_USB_EHCI_MXC=y |
@@ -240,6 +238,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y | |||
240 | CONFIG_LEDS_TRIGGER_GPIO=y | 238 | CONFIG_LEDS_TRIGGER_GPIO=y |
241 | CONFIG_RTC_CLASS=y | 239 | CONFIG_RTC_CLASS=y |
242 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 240 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
241 | CONFIG_RTC_DRV_ISL1208=y | ||
243 | CONFIG_RTC_DRV_PCF8563=y | 242 | CONFIG_RTC_DRV_PCF8563=y |
244 | CONFIG_RTC_DRV_MC13XXX=y | 243 | CONFIG_RTC_DRV_MC13XXX=y |
245 | CONFIG_RTC_DRV_MXC=y | 244 | CONFIG_RTC_DRV_MXC=y |
@@ -254,7 +253,6 @@ CONFIG_DRM_IMX_FB_HELPER=y | |||
254 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y | 253 | CONFIG_DRM_IMX_PARALLEL_DISPLAY=y |
255 | CONFIG_DRM_IMX_TVE=y | 254 | CONFIG_DRM_IMX_TVE=y |
256 | CONFIG_DRM_IMX_LDB=y | 255 | CONFIG_DRM_IMX_LDB=y |
257 | CONFIG_DRM_IMX_IPUV3_CORE=y | ||
258 | CONFIG_DRM_IMX_IPUV3=y | 256 | CONFIG_DRM_IMX_IPUV3=y |
259 | CONFIG_DRM_IMX_HDMI=y | 257 | CONFIG_DRM_IMX_HDMI=y |
260 | # CONFIG_IOMMU_SUPPORT is not set | 258 | # CONFIG_IOMMU_SUPPORT is not set |