From 356066099ee58c3e260105e7072230c774b334a4 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 15 Apr 2020 19:52:31 +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 ab66d6c48c8e78e74ebbf41505db65b0830e6fd7 ARM: apalis/colibri-imx6/7/6ull: enable options for backports 8d6cc5a3e9a2cf349c4d42e13c4449f16512651e ARM: apalis/colibri-imx6/7/6ull: disable wireless drivers c666f52447fa426fdc414bb1c922d89969f25385 arm64: defconfig: enable options required for backports d55c4e1ff7f1a6b23908d45bfec48b2c717d13fe arm64: defconfig: disable wireless drivers Related-to: ELB-2687 Signed-off-by: Oleksandr Suvorov --- .../linux-toradex-4.14-2.3.x/apalis-imx6/defconfig | 24 ++++++++++++++-------- .../colibri-imx6/defconfig | 22 ++++++++++++++------ .../colibri-imx6ull/defconfig | 22 ++++++++++++++------ .../linux/linux-toradex-4.14-2.3.x/mx7/defconfig | 22 ++++++++++++++------ .../linux/linux-toradex-4.14-2.3.x/mx8/defconfig | 15 ++++---------- 5 files changed, 68 insertions(+), 37 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 9a85f67..34deb86 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 @@ -121,9 +121,8 @@ CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=y @@ -200,13 +199,22 @@ CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m +# CONFIG_WLAN_VENDOR_ADMTEK is not set # CONFIG_WLAN_VENDOR_ATH is not set -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PCIE=y -CONFIG_HOSTAP=m -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_PCIE=m +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_IVSHMEM_NET=m CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m 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 2579266..67d18d1 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 @@ -118,9 +118,8 @@ CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=y @@ -203,11 +202,22 @@ CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m +# CONFIG_WLAN_VENDOR_ADMTEK is not set # CONFIG_WLAN_VENDOR_ATH is not set -CONFIG_BRCMFMAC=m -CONFIG_HOSTAP=m -CONFIG_MWIFIEX=m +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m # CONFIG_KEYBOARD_ATKBD is not set 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 bc4c883..edf28b2 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 @@ -117,9 +117,8 @@ CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=y @@ -198,11 +197,22 @@ CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m +# CONFIG_WLAN_VENDOR_ADMTEK is not set # CONFIG_WLAN_VENDOR_ATH is not set -CONFIG_BRCMFMAC=m -CONFIG_HOSTAP=m -CONFIG_MWIFIEX=m +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_INPUT_POLLDEV=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m 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 f0bef60..be64640 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 @@ -117,9 +117,8 @@ CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=y @@ -199,11 +198,22 @@ CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m +# CONFIG_WLAN_VENDOR_ADMTEK is not set # CONFIG_WLAN_VENDOR_ATH is not set -CONFIG_BRCMFMAC=m -CONFIG_HOSTAP=m -CONFIG_MWIFIEX=m +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m # CONFIG_KEYBOARD_ATKBD is not set 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 4c5b98d..689106c 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 @@ -190,11 +190,8 @@ CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m -CONFIG_MAC80211_LEDS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=y @@ -306,11 +303,6 @@ CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m # CONFIG_WLAN_VENDOR_ATH is not set -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PCIE=y -CONFIG_HOSTAP=m -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_PCIE=m # CONFIG_WLAN_VENDOR_TI is not set CONFIG_XEN_NETDEV_BACKEND=m CONFIG_IVSHMEM_NET=m @@ -737,7 +729,6 @@ CONFIG_VIRTIO_MMIO=y CONFIG_XEN_GNTDEV=y CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_STAGING=y -CONFIG_R8188EU=m CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_ION_CMA_HEAP=y @@ -873,12 +864,14 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MEMTEST=y CONFIG_SECURITY=y CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_RMD256=y -- cgit v1.2.3