From 5a12a600be5b7aa85aba72caa2e3840c687df1dd Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 14 Apr 2020 20:47:30 +0300 Subject: linux-toradex-rt: synchronise defconfigs Basically, as per the following commit from the toradex_4.14-2.3.x-imx branch on git://git.toradex.com/linux-toradex.git 19a90652d70208c755d3339e21f6bfc8cae04b82: ARM: apalis/colibri: defconfig: remove backported drivers 76b17e9c0b6f0245dc76c59062257bea2d0d6a0f: arm64: apalis/colibri: defconfig: remove backported drivers Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov --- recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/apalis-imx6/defconfig | 3 --- .../linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6/defconfig | 3 --- .../linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6ull/defconfig | 3 --- recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx7/defconfig | 3 --- recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx8/defconfig | 2 -- 5 files changed, 14 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/apalis-imx6/defconfig index 8b39231..cae6f53 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/apalis-imx6/defconfig @@ -204,9 +204,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PCIE=y CONFIG_HOSTAP=m CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_IVSHMEM_NET=m CONFIG_INPUT_EVDEV=y @@ -385,7 +383,6 @@ CONFIG_IMX_SDMA=m CONFIG_MXC_PXP_V2=y # CONFIG_MX3_IPU is not set CONFIG_STAGING=y -CONFIG_R8188EU=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_STMPE_ADC=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6/defconfig index 99f3103..d6f9305 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6/defconfig @@ -206,8 +206,6 @@ CONFIG_USB_NET_MCS7830=m CONFIG_BRCMFMAC=m CONFIG_HOSTAP=m CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_USB=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m @@ -380,7 +378,6 @@ CONFIG_IMX_SDMA=m CONFIG_MXC_PXP_V2=y # CONFIG_MX3_IPU is not set CONFIG_STAGING=y -CONFIG_R8188EU=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXTCON_USB_GPIO=y CONFIG_IIO=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6ull/defconfig index 762555f..69ee214 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/colibri-imx6ull/defconfig @@ -201,8 +201,6 @@ CONFIG_USB_NET_MCS7830=m CONFIG_BRCMFMAC=m CONFIG_HOSTAP=m CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_USB=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_INPUT_POLLDEV=y CONFIG_INPUT_EVDEV=y @@ -355,7 +353,6 @@ CONFIG_MXC_PXP_V2=y CONFIG_MXC_PXP_V3=y # CONFIG_MX3_IPU is not set CONFIG_STAGING=y -CONFIG_R8188EU=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXTCON_USB_GPIO=y CONFIG_IIO=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx7/defconfig index b480fb4..2d8173a 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx7/defconfig @@ -202,8 +202,6 @@ CONFIG_USB_NET_MCS7830=m CONFIG_BRCMFMAC=m CONFIG_HOSTAP=m CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_USB=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m @@ -363,7 +361,6 @@ CONFIG_MXS_DMA=y CONFIG_MXC_PXP_V2=y CONFIG_MXC_PXP_V3=y CONFIG_STAGING=y -CONFIG_R8188EU=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXTCON_USB_GPIO=y CONFIG_IIO=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx8/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx8/defconfig index 17b8b02..a96d8a0 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx8/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.14-2.3.x/mx8/defconfig @@ -309,9 +309,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PCIE=y CONFIG_HOSTAP=m CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_XEN_NETDEV_BACKEND=m CONFIG_IVSHMEM_NET=m -- cgit v1.2.3