From afd194568f525a3accfe75bbab027d6cc0f6c23c Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 15 Oct 2015 13:45:03 +0200 Subject: [PATCH] meta-digi: move WIRELESS_MODULE to machine config files Which wireless module to use belongs more to the machine config files in the BSP layer, than to the generic wireless packagegroup. https://jira.digi.com/browse/DEL-1858 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccardimx28.inc | 6 +++++- meta-digi-arm/conf/machine/include/ccimx51.inc | 6 +++++- meta-digi-arm/conf/machine/include/ccimx53.inc | 6 +++++- meta-digi-arm/conf/machine/include/ccimx6.inc | 5 ++++- .../packagegroups/packagegroup-dey-wireless.bb | 6 ------ 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index ac4585bdf..23bc73417 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -16,12 +16,16 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" # wpa_supplicant driver to use in '/etc/network/interfaces' WPA_DRIVER = "nl80211" +# Wireless external module +WIRELESS_MODULE ?= "" +WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" + # Firmware MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_FEATURES += "alsa touchscreen" diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc index f2546d512..967a33f09 100644 --- a/meta-digi-arm/conf/machine/include/ccimx51.inc +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -16,11 +16,15 @@ UBOOT_ENTRYPOINT = "0x90008000" UBOOT_SUFFIX = "bin" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" +# Wireless external module +WIRELESS_MODULE ?= "" +WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" + # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver" diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc index 40735e028..21ff99f24 100644 --- a/meta-digi-arm/conf/machine/include/ccimx53.inc +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -16,11 +16,15 @@ UBOOT_ENTRYPOINT = "0x70008000" UBOOT_SUFFIX = "bin" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" +# Wireless external module +WIRELESS_MODULE ?= "" +WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" + # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 49e31c9d1..2274719e2 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -16,6 +16,9 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" # wpa_supplicant driver to use in '/etc/network/interfaces' WPA_DRIVER = "nl80211" +# Wireless external module +WIRELESS_MODULE ?= "" + # Firmware MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" @@ -28,7 +31,7 @@ MACHINE_EXTRA_RDEPENDS += " \ parted \ u-boot-fw-utils \ " -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins" MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 4866cf5ee..673b16e4f 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -8,18 +8,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -WIRELESS_MODULE ?= "" -WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" -WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" -# WIRELESS_MODULE_append_mx6 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" - RDEPENDS_${PN} = "\ crda \ wireless-tools \ wpa-supplicant \ wpa-supplicant-cli \ wpa-supplicant-passphrase \ - ${WIRELESS_MODULE} \ " RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools"