summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-12-10 23:59:05 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-12-10 23:59:05 +0100
commitfab92d1030fdc4e89cb8e811d5c023fe3abdb181 (patch)
tree2964c037c88236efbe5ded98e394caf55aa8948b
parent3bd92089460b412e2caa76ae0d3a8d7eb362ae2f (diff)
(apalis|colibri)*_defconfig: resync with kernel defconfigs
Resync with the defconfigs from the kernel repository. This adds: - enable USB WiFi adapter. Related-to: #58517 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig1
-rw-r--r--recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig2
-rw-r--r--recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig2
-rw-r--r--recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig3
4 files changed, 6 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig
index 89eb48d..f073b16 100644
--- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig
@@ -289,6 +289,7 @@ 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.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig
index 6aac6ca..ee7d265 100644
--- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig
@@ -128,7 +128,6 @@ CONFIG_NETDEVICES=y
CONFIG_MICREL_PHY=y
CONFIG_PPP=m
CONFIG_USB_USBNET=y
-# CONFIG_WLAN is not set
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_IMX=y
@@ -281,6 +280,7 @@ 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.0.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig
index 982c7b4..4367e9b 100644
--- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig
@@ -304,6 +304,8 @@ CONFIG_MXS_DMA=y
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.0.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig
index 46bb5a8..e8d5b28 100644
--- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig
@@ -166,7 +166,6 @@ CONFIG_USB_USBNET=m
# CONFIG_USB_NET_NET1080 is not set
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_WLAN is not set
CONFIG_INPUT_POLLDEV=y
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
@@ -304,6 +303,8 @@ CONFIG_IMX_SDMA=m
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