[meta-freescale] [PATCH v2 35/43] firmware-qca9377: Add support for QCA9377 on i.MX 7ULP

[Tom Hochstein]

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
 conf/machine/imx7ulpevk.conf                     |  2 +-
 conf/machine/include/imx-base.inc                |  3 +++
 recipes-bsp/firmware-qca/firmware-qca.inc        | 15 +++++++++++++
 recipes-bsp/firmware-qca/firmware-qca9377_2.0.bb | 27 ++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/firmware-qca/firmware-qca.inc
 create mode 100644 recipes-bsp/firmware-qca/firmware-qca9377_2.0.bb

diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d077de7..6fa9098 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
 
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += " pci wifi bluetooth qca9377"
 
 MACHINEOVERRIDES =. "mx7:mx7ulp:"
 
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 70ec39a..0e85143 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -203,6 +203,9 @@ MACHINE_EXTRA_RRECOMMENDS_append_mx6ull = " ${@bb.utils.contains('DISTRO_FEATURE
 MACHINE_EXTRA_RRECOMMENDS_append_mx7d = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
 MACHINE_EXTRA_RRECOMMENDS_append_mx7ulp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
 
+# Extra QCA Wi-Fi & BTE driver and firmware
+MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'firmware-qca9377 kernel-module-qca9377 qca-tools', '', d)}"
+
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 
diff --git a/recipes-bsp/firmware-qca/firmware-qca.inc b/recipes-bsp/firmware-qca/firmware-qca.inc
new file mode 100644
index 0000000..20d1fa5
--- /dev/null
+++ b/recipes-bsp/firmware-qca/firmware-qca.inc
@@ -0,0 +1,15 @@
+# Copyright 2018 NXP
+
+SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28 \
+                    file://QUALCOMM_ATHEROS_LICENSE_AGREEMENT.pdf;md5=e629669cf17f6a2a6872e067582986e3 \
+"
+
+SRC_URI = " ${FSL_MIRROR}/firmware-qca-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "d2b7766a0919c2084ba7c911b7ddc1d0"
+SRC_URI[sha256sum] = "001eaaf7008d1354daeb7dbfbc86de1269cc4d6e5b49fa7f811eb82035602a42"
+S = "${WORKDIR}/firmware-qca-${PV}"
+
+inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-qca/firmware-qca9377_2.0.bb b/recipes-bsp/firmware-qca/firmware-qca9377_2.0.bb
new file mode 100644
index 0000000..5bee32d
--- /dev/null
+++ b/recipes-bsp/firmware-qca/firmware-qca9377_2.0.bb
@@ -0,0 +1,27 @@
+# Copyright 2018 NXP
+
+require firmware-qca.inc
+
+SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware"
+DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth firmware for modules such as QCA9377-3"
+SECTION = "base"
+LICENSE = "Proprietary"
+
+inherit allarch
+
+do_install () {
+    # Install firmware.conf for QCA modules
+    install -d ${D}${sysconfdir}/bluetooth
+    install -m 644 ${S}/1PJ_QCA9377-3_LEA_2.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth
+
+    # Install firmware files
+    install -d ${D}${base_libdir}
+    cp -r ${S}/1PJ_QCA9377-3_LEA_2.0/lib/firmware ${D}${base_libdir}
+}
+
+FILES_${PN} = " \
+    ${sysconfdir}/bluetooth/firmware.conf \
+    ${base_libdir}/firmware/qca \
+    ${base_libdir}/firmware/qca9377 \
+    ${base_libdir}/firmware/wlan \
+"
-- 
2.7.4