summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>2020-05-07 14:50:57 +0300
committerOleksandr Suvorov <oleksandr.suvorov@toradex.com>2020-05-14 14:09:54 +0300
commitc4703795816f36113f6ea5bb8640f903ac807aa1 (patch)
tree54cdce2e1430e8f809232cebfa562cc8d44833ee /arch
parent8ecfa3c7daf44fd74bce27ce2d7cd15cc9c691ec (diff)
ARM: apalis/colibri-imx6/7/6ull: disable wireless drivers
Disabling all wireless drivers and cfg80211 module to avoid conflicts with backported drivers. Related-to: ELB-2724 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/apalis_imx6_defconfig4
-rw-r--r--arch/arm/configs/colibri-imx6ull_defconfig3
-rw-r--r--arch/arm/configs/colibri_imx6_defconfig2
-rw-r--r--arch/arm/configs/colibri_imx7_defconfig3
4 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig
index abd747146b9c..f78c7512c775 100644
--- a/arch/arm/configs/apalis_imx6_defconfig
+++ b/arch/arm/configs/apalis_imx6_defconfig
@@ -81,8 +81,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_GPIO=y
CONFIG_DEVTMPFS=y
@@ -135,7 +133,7 @@ CONFIG_NETDEVICES=y
CONFIG_MICREL_PHY=y
CONFIG_PPP=m
CONFIG_USB_USBNET=y
-# CONFIG_RTL_CARDS is not set
+# CONFIG_WLAN is not set
CONFIG_INPUT_POLLDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
diff --git a/arch/arm/configs/colibri-imx6ull_defconfig b/arch/arm/configs/colibri-imx6ull_defconfig
index a605b321e060..898c03f6a736 100644
--- a/arch/arm/configs/colibri-imx6ull_defconfig
+++ b/arch/arm/configs/colibri-imx6ull_defconfig
@@ -107,9 +107,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig
index e71ca9921fdc..eba07a7b52c5 100644
--- a/arch/arm/configs/colibri_imx6_defconfig
+++ b/arch/arm/configs/colibri_imx6_defconfig
@@ -79,8 +79,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_GPIO=y
CONFIG_DEVTMPFS=y
diff --git a/arch/arm/configs/colibri_imx7_defconfig b/arch/arm/configs/colibri_imx7_defconfig
index d8d7a72b786b..44e0a0dcf8d0 100644
--- a/arch/arm/configs/colibri_imx7_defconfig
+++ b/arch/arm/configs/colibri_imx7_defconfig
@@ -106,9 +106,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y