Skip to content

Commit 42832d0

Browse files
Josua-SRShawn Guo
authored andcommitted
ARM: imx_v4_v5_defconfig: update for v6.19-rc1
The i.MX ARM v4/v5 defconfig has gone out of sync with some dead options, some removed and some missing. 1. Add missing options no longer enabled by default: - CONFIG_I2C=y - CONFIG_LCD_CLASS_DEVICE=y 2. Remove options enabled by default: - CONFIG_CS89x0=y - CONFIG_MEDIA_CAMERA_SUPPORT=y 3. Remove options that have no effect: - # CONFIG_INET_XFRM_MODE_TRANSPORT is not set - # CONFIG_INET_XFRM_MODE_TUNNEL is not set - # CONFIG_INET_XFRM_MODE_BEET is not set 4. Remove options that have been removed completely from the kernel: - CONFIG_USB_EHCI_MXC=y Removed by commit e701875 ("usb: host: ehci-mxc: Remove the driver"). - CONFIG_SMC911X=y Removed by commit a2fd084 ("net: remove smc911x driver"). - -CONFIG_SND_SOC_MX27VIS_AIC32X4=y Removed by commit 3fbb01f ("ASoC: mx27vis-aic32x4: Remove unused driver"). - CONFIG_SND_SOC_PHYCORE_AC97=y Removed by commit 440534a ("ASoC: phycore-ac97: Remove unused driver"). - CONFIG_SND_SOC_IMX_MC13783=y Removed by commit 83e7e22 ("ASoC: imx-mc13783: Remove unused driver"). Reviewed-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Josua Mayer <josua@solid-run.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 4cd1ead commit 42832d0

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ CONFIG_INET=y
2929
CONFIG_IP_MULTICAST=y
3030
CONFIG_IP_PNP=y
3131
CONFIG_IP_PNP_DHCP=y
32-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
33-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
34-
# CONFIG_INET_XFRM_MODE_BEET is not set
3532
# CONFIG_INET_DIAG is not set
3633
# CONFIG_IPV6 is not set
3734
CONFIG_NETFILTER=y
@@ -58,11 +55,9 @@ CONFIG_BLK_DEV_SD=y
5855
CONFIG_ATA=y
5956
CONFIG_PATA_IMX=y
6057
CONFIG_NETDEVICES=y
61-
CONFIG_CS89x0=y
6258
CONFIG_CS89x0_PLATFORM=y
6359
CONFIG_DM9000=y
6460
CONFIG_SMC91X=y
65-
CONFIG_SMC911X=y
6661
CONFIG_SMSC911X=y
6762
CONFIG_SMSC_PHY=y
6863
CONFIG_INPUT_EVDEV=y
@@ -78,6 +73,7 @@ CONFIG_SERIAL_8250=m
7873
CONFIG_SERIAL_IMX=y
7974
CONFIG_SERIAL_IMX_CONSOLE=y
8075
# CONFIG_HW_RANDOM is not set
76+
CONFIG_I2C=y
8177
CONFIG_I2C_CHARDEV=y
8278
CONFIG_I2C_IMX=y
8379
CONFIG_SPI=y
@@ -100,12 +96,12 @@ CONFIG_REGULATOR_GPIO=y
10096
CONFIG_REGULATOR_MC13783=y
10197
CONFIG_REGULATOR_MC13892=y
10298
CONFIG_MEDIA_SUPPORT=y
103-
CONFIG_MEDIA_CAMERA_SUPPORT=y
10499
CONFIG_V4L_PLATFORM_DRIVERS=y
105100
CONFIG_V4L_MEM2MEM_DRIVERS=y
106101
CONFIG_VIDEO_CODA=y
107102
CONFIG_FB=y
108103
CONFIG_FB_IMX=y
104+
CONFIG_LCD_CLASS_DEVICE=y
109105
CONFIG_LCD_L4F00242T03=y
110106
CONFIG_FRAMEBUFFER_CONSOLE=y
111107
CONFIG_LOGO=y
@@ -115,16 +111,12 @@ CONFIG_SND=y
115111
# CONFIG_SND_SPI is not set
116112
CONFIG_SND_SOC=y
117113
CONFIG_SND_IMX_SOC=y
118-
CONFIG_SND_SOC_MX27VIS_AIC32X4=y
119-
CONFIG_SND_SOC_PHYCORE_AC97=y
120114
CONFIG_SND_SOC_EUKREA_TLV320=y
121-
CONFIG_SND_SOC_IMX_MC13783=y
122115
CONFIG_SND_SOC_FSL_ASOC_CARD=y
123116
CONFIG_SND_SOC_SGTL5000=y
124117
CONFIG_USB_HID=m
125118
CONFIG_USB=y
126119
CONFIG_USB_EHCI_HCD=y
127-
CONFIG_USB_EHCI_MXC=y
128120
CONFIG_USB_STORAGE=y
129121
CONFIG_USB_CHIPIDEA=y
130122
CONFIG_USB_CHIPIDEA_UDC=y

0 commit comments

Comments
 (0)