Skip to content

Commit 64546e9

Browse files
Fabio EstevamShawn Guo
authored andcommitted
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 <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 0650f85 commit 64546e9

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ CONFIG_MACH_IMX35_DT=y
3232
CONFIG_MACH_PCM043=y
3333
CONFIG_MACH_MX35_3DS=y
3434
CONFIG_MACH_VPR200=y
35-
CONFIG_SOC_IMX51=y
3635
CONFIG_SOC_IMX50=y
36+
CONFIG_SOC_IMX51=y
3737
CONFIG_SOC_IMX53=y
3838
CONFIG_SOC_IMX6Q=y
3939
CONFIG_SOC_IMX6SL=y
@@ -105,7 +105,6 @@ CONFIG_EEPROM_AT24=y
105105
CONFIG_EEPROM_AT25=y
106106
# CONFIG_SCSI_PROC_FS is not set
107107
CONFIG_BLK_DEV_SD=y
108-
CONFIG_SCSI_MULTI_LUN=y
109108
CONFIG_SCSI_CONSTANTS=y
110109
CONFIG_SCSI_LOGGING=y
111110
CONFIG_SCSI_SCAN_ASYNC=y
@@ -153,14 +152,12 @@ CONFIG_SERIAL_IMX_CONSOLE=y
153152
CONFIG_SERIAL_FSL_LPUART=y
154153
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
155154
CONFIG_HW_RANDOM=y
156-
CONFIG_HW_RANDOM_MXC_RNGA=y
157155
# CONFIG_I2C_COMPAT is not set
158156
CONFIG_I2C_CHARDEV=y
159157
# CONFIG_I2C_HELPER_AUTO is not set
160158
CONFIG_I2C_ALGOPCF=m
161159
CONFIG_I2C_ALGOPCA=m
162160
CONFIG_I2C_IMX=y
163-
CONFIG_SPI=y
164161
CONFIG_SPI_IMX=y
165162
CONFIG_GPIO_SYSFS=y
166163
CONFIG_GPIO_MC9S08DZ60=y
@@ -198,21 +195,22 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
198195
CONFIG_LCD_CLASS_DEVICE=y
199196
CONFIG_LCD_L4F00242T03=y
200197
CONFIG_LCD_PLATFORM=y
201-
CONFIG_BACKLIGHT_CLASS_DEVICE=y
202198
CONFIG_BACKLIGHT_PWM=y
203199
CONFIG_BACKLIGHT_GPIO=y
204200
CONFIG_FRAMEBUFFER_CONSOLE=y
205201
CONFIG_LOGO=y
206202
CONFIG_SOUND=y
207203
CONFIG_SND=y
208204
CONFIG_SND_SOC=y
205+
CONFIG_SND_SOC_FSL_SAI=y
209206
CONFIG_SND_IMX_SOC=y
210207
CONFIG_SND_SOC_PHYCORE_AC97=y
211208
CONFIG_SND_SOC_EUKREA_TLV320=y
212209
CONFIG_SND_SOC_IMX_WM8962=y
213210
CONFIG_SND_SOC_IMX_SGTL5000=y
214211
CONFIG_SND_SOC_IMX_SPDIF=y
215212
CONFIG_SND_SOC_IMX_MC13783=y
213+
CONFIG_SND_SIMPLE_CARD=y
216214
CONFIG_USB=y
217215
CONFIG_USB_EHCI_HCD=y
218216
CONFIG_USB_EHCI_MXC=y
@@ -240,6 +238,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
240238
CONFIG_LEDS_TRIGGER_GPIO=y
241239
CONFIG_RTC_CLASS=y
242240
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
241+
CONFIG_RTC_DRV_ISL1208=y
243242
CONFIG_RTC_DRV_PCF8563=y
244243
CONFIG_RTC_DRV_MC13XXX=y
245244
CONFIG_RTC_DRV_MXC=y
@@ -254,7 +253,6 @@ CONFIG_DRM_IMX_FB_HELPER=y
254253
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
255254
CONFIG_DRM_IMX_TVE=y
256255
CONFIG_DRM_IMX_LDB=y
257-
CONFIG_DRM_IMX_IPUV3_CORE=y
258256
CONFIG_DRM_IMX_IPUV3=y
259257
CONFIG_DRM_IMX_HDMI=y
260258
# CONFIG_IOMMU_SUPPORT is not set

0 commit comments

Comments
 (0)