From dcd97799c99a548444e2994eee9efee91ccb4e9b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 16 Sep 2021 11:14:25 +0200 Subject: [PATCH] ccimx6sbc: install Qualcomm-related packages along with the Atheros ones The idea is to have the support for both chips co-exist in the same image, then have the system detect which chip is being used during runtime. https://onedigi.atlassian.net/browse/DEL-7661 https://onedigi.atlassian.net/browse/DEL-7666 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/ccimx6sbc.conf | 8 +++++--- .../packagegroups/packagegroup-dey-wireless.bb | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 9d76e4c37..c10b3fd6a 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -5,11 +5,13 @@ # Contains the ConnectCore 6 module. include conf/machine/include/ccimx6.inc -HAS_WIFI_VIRTWLANS = "false" +# Wireless external module +WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" +HAS_WIFI_VIRTWLANS = "true" # Firmware -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" -MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}" +MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k firmware-qualcomm-qca6564-bt', '', d)}" +MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl firmware-qualcomm-qca6564-wifi', '', d)}" PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" 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 98c66489d..5b53bf943 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -16,4 +16,3 @@ RDEPENDS_${PN} = "\ " RDEPENDS_${PN}_append_ccimx6sbc = " ath-prop-tools" -RDEPENDS_${PN}_remove_ccimx6sbc = "hostapd"