From daee2f556df696939eeba1d70d0bda84a932ff54 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 26 Apr 2013 15:51:05 +0200 Subject: [PATCH] meta-digi-arm: Separate wireless and bluetooth into configuration fragments https://jira.digi.com/browse/DEL-430 Signed-off-by: Alex Gonzalez --- .../ccardimx28js/config-bluetooth-atheros.cfg | 12 +++++ .../ccardimx28js/config-wireless-atheros.cfg | 8 +++ .../ccardimx28js/defconfig | 52 ++----------------- .../linux-del-2.6.35.14/ccimx51js/defconfig | 26 +--------- .../ccimx53js/config-wireless-redpine.cfg | 14 +++++ .../linux-del-2.6.35.14/ccimx53js/defconfig | 26 +--------- .../linux/linux-del_2.6.35.14.bb | 3 ++ 7 files changed, 44 insertions(+), 97 deletions(-) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-bluetooth-atheros.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-wireless-atheros.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-wireless-redpine.cfg diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-bluetooth-atheros.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-bluetooth-atheros.cfg new file mode 100644 index 000000000..34b573849 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-bluetooth-atheros.cfg @@ -0,0 +1,12 @@ +CONFIG_MXS_AUART0_DEVICE_ENABLE=y +CONFIG_MXS_AUART0_4WIRE=y +CONFIG_MXS_AUART0_DMA_ENABLE=y +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_L2CAP_EXT_FEATURES=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_HIDP=y +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_ATH3K=y + diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-wireless-atheros.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-wireless-atheros.cfg new file mode 100644 index 000000000..7b245ac6e --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-wireless-atheros.cfg @@ -0,0 +1,8 @@ +CONFIG_MMC_MXS_SSP2_ENABLE=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_RFKILL=y +CONFIG_RFKILL_INPUT=y + diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig index f526a9440..3a7dfa172 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig @@ -290,11 +290,6 @@ CONFIG_MXS_PWM_CHANNELS=8 # CONFIG_MXS_AUART_DMA_SUPPORT=y CONFIG_MXS_AUART_PORTS=5 -CONFIG_MXS_AUART0_DEVICE_ENABLE=y -# CONFIG_MXS_AUART0_2WIRE is not set -CONFIG_MXS_AUART0_4WIRE=y -# CONFIG_MXS_AUART0_GPIO_CTS_RTS is not set -CONFIG_MXS_AUART0_DMA_ENABLE=y # CONFIG_MXS_AUART1_DEVICE_ENABLE is not set # CONFIG_MXS_AUART1_2WIRE is not set # CONFIG_MXS_AUART1_4WIRE is not set @@ -552,51 +547,11 @@ CONFIG_CAN_BCM=y # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_FLEXCAN=y # CONFIG_IRDA is not set -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_L2CAP_EXT_FEATURES=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -# CONFIG_BT_RFCOMM_TTY is not set -# CONFIG_BT_BNEP is not set -CONFIG_BT_HIDP=y - -# -# Bluetooth device drivers -# -# CONFIG_BT_HCIBTUSB is not set -# CONFIG_BT_HCIBTSDIO is not set -CONFIG_BT_HCIUART=y -# CONFIG_BT_HCIUART_H4 is not set -# CONFIG_BT_HCIUART_BCSP is not set -CONFIG_BT_HCIUART_ATH3K=y -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set +# CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -# CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_OLD_REGULATORY is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set -# CONFIG_LIB80211 is not set - -# -# CFG80211 needs to be enabled for MAC80211 -# - -# -# Some wireless drivers require a rate control algorithm -# -# CONFIG_IEEE80211 is not set +# CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set -CONFIG_RFKILL=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set @@ -1065,7 +1020,6 @@ CONFIG_W1=y # # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set -CONFIG_W1_SLAVE_DS2431=y # CONFIG_W1_SLAVE_DS2751 is not set # CONFIG_W1_SLAVE_DS2433 is not set # CONFIG_W1_SLAVE_DS2438 is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig index 4e1fecd04..c010c22fa 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/defconfig @@ -589,31 +589,9 @@ CONFIG_LLC=y # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_OLD_REGULATORY=y -CONFIG_WIRELESS_EXT_SYSFS=y -# CONFIG_LIB80211 is not set -# CONFIG_MAC80211 is not set - -# -# Some wireless drivers require a rate control algorithm -# -# CONFIG_IEEE80211 is not set +# CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set -CONFIG_RFKILL=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-wireless-redpine.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-wireless-redpine.cfg new file mode 100644 index 000000000..1f2645881 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-wireless-redpine.cfg @@ -0,0 +1,14 @@ +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=y +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_RFKILL=y +CONFIG_RFKILL_INPUT=y + diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig index c9add49af..bc8d77cc7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/defconfig @@ -607,31 +607,9 @@ CONFIG_CAN_FLEXCAN=y # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_OLD_REGULATORY=y -CONFIG_WIRELESS_EXT_SYSFS=y -# CONFIG_LIB80211 is not set -# CONFIG_MAC80211 is not set - -# -# Some wireless drivers require a rate control algorithm -# -# CONFIG_IEEE80211 is not set +# CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set -CONFIG_RFKILL=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb index 1086d9439..0d58fd86c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb @@ -23,7 +23,10 @@ KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS_append_mx5 = "file://config-sahara-module.cfg file://config-camera-module.cfg" KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accelerometer', 'file://config-accel-module.cfg', '', d)}" KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth-module.cfg', '', d)}" +KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'wifi', 'file://config-wireless-redpine.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccimx51js = " file://config-battery-module.cfg" +KERNEL_CFG_FRAGS_append_mxs = " ${@base_contains('MACHINE_FEATURES', 'wifi', 'file://config-wireless-atheros.cfg', '', d)}" +KERNEL_CFG_FRAGS_append_mxs = " ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'file://config-bluetooth-atheros.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', '1-wire', 'file://config-1-wire.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}"