Commit 42832d01 authored by Josua Mayer's avatar Josua Mayer Committed by Shawn Guo
Browse files

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 e7018751 ("usb: host: ehci-mxc: Remove the
driver").
- CONFIG_SMC911X=y
  Removed by commit a2fd0844 ("net: remove smc911x driver").
- -CONFIG_SND_SOC_MX27VIS_AIC32X4=y
  Removed by commit 3fbb01fb ("ASoC: mx27vis-aic32x4: Remove unused
driver").
- CONFIG_SND_SOC_PHYCORE_AC97=y
  Removed by commit 440534a0 ("ASoC: phycore-ac97: Remove unused
driver").
- CONFIG_SND_SOC_IMX_MC13783=y
  Removed by commit 83e7e227 ("ASoC: imx-mc13783: Remove unused
driver").

Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarJosua Mayer <josua@solid-run.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4cd1eadb

arch/arm/configs/imx_v4_v5_defconfig

+2 −10
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y
@@ -58,11 +55,9 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

CONFIG_CS89x0=y

CONFIG_CS89x0_PLATFORM=y

CONFIG_DM9000=y

CONFIG_SMC91X=y

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

CONFIG_SMSC_PHY=y

CONFIG_INPUT_EVDEV=y
@@ -78,6 +73,7 @@ CONFIG_SERIAL_8250=m 
CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y
@@ -100,12 +96,12 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_CODA=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y
@@ -115,16 +111,12 @@ CONFIG_SND=y 
# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_SOC_MX27VIS_AIC32X4=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_SGTL5000=y

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y