From 634b01a87213f7cdb3f7bc7aa6219a516b0f9923 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 14 Apr 2020 20:49:32 +0300 Subject: linux-toradex: 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-4.14-2.3.x/apalis-imx6/defconfig | 3 --- recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6/defconfig | 3 --- .../linux/linux-toradex-4.14-2.3.x/colibri-imx6ull/defconfig | 3 --- recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx7/defconfig | 3 --- recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx8/defconfig | 2 -- 5 files changed, 14 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/apalis-imx6/defconfig index 03c2062..9a85f67 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/apalis-imx6/defconfig @@ -205,9 +205,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 @@ -386,7 +384,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-4.14-2.3.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6/defconfig index 477523d..2579266 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6/defconfig @@ -207,8 +207,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 @@ -381,7 +379,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-4.14-2.3.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6ull/defconfig index 866e045..bc4c883 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/colibri-imx6ull/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_POLLDEV=y CONFIG_INPUT_EVDEV=y @@ -356,7 +354,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-4.14-2.3.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx7/defconfig index 52de4ec..f0bef60 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx7/defconfig @@ -203,8 +203,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 @@ -364,7 +362,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-4.14-2.3.x/mx8/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx8/defconfig index 49ad2fd..4c5b98d 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx8/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/mx8/defconfig @@ -310,9 +310,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