From 311f917844727c16f612dd5b9f26fa73588d22bf Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 18 Aug 2020 23:11:29 +0000 Subject: firmware-qca: upgrade to 3.0.2 Upstream component version has been updated, align recipe to pick up the new version. This version is licensed under new LA_OPT_NXP_Software_License v10 dated December 2019. Signed-off-by: Andrey Zhizhikin --- recipes-bsp/firmware-qca/firmware-qca.inc | 8 +++---- recipes-bsp/firmware-qca/firmware-qca6174_3.0.1.bb | 27 ---------------------- recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb | 27 ++++++++++++++++++++++ recipes-bsp/firmware-qca/firmware-qca9377_3.0.1.bb | 27 ---------------------- recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb | 27 ++++++++++++++++++++++ recipes-bsp/firmware-qca/qca-tools_3.0.1.bb | 20 ---------------- recipes-bsp/firmware-qca/qca-tools_3.0.2.bb | 20 ++++++++++++++++ 7 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 recipes-bsp/firmware-qca/firmware-qca6174_3.0.1.bb create mode 100644 recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb delete mode 100644 recipes-bsp/firmware-qca/firmware-qca9377_3.0.1.bb create mode 100644 recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb delete mode 100644 recipes-bsp/firmware-qca/qca-tools_3.0.1.bb create mode 100644 recipes-bsp/firmware-qca/qca-tools_3.0.2.bb diff --git a/recipes-bsp/firmware-qca/firmware-qca.inc b/recipes-bsp/firmware-qca/firmware-qca.inc index bafd0ea8..f33f4eb9 100644 --- a/recipes-bsp/firmware-qca/firmware-qca.inc +++ b/recipes-bsp/firmware-qca/firmware-qca.inc @@ -1,15 +1,15 @@ -# Copyright 2018-2019 NXP +# Copyright (C) 2018-2020 NXP SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d \ file://QUALCOMM_ATHEROS_LICENSE_AGREEMENT.pdf;md5=e629669cf17f6a2a6872e067582986e3 \ " SRC_URI = " ${FSL_MIRROR}/firmware-qca-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "3569cb11300758635d2502322c5bf206" -SRC_URI[sha256sum] = "ae75308d59390e926244ad2594248c3c835ee780e94e4a92ac536429cccd286b" +SRC_URI[md5sum] = "75b1b2a8dea8f81609ccfc072d42fa86" +SRC_URI[sha256sum] = "6ad56ac1df841e252ac6db0a8966082715a3cb6dc7189426bade13333a16fd9d" S = "${WORKDIR}/firmware-qca-${PV}" inherit fsl-eula-unpack diff --git a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.1.bb b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.1.bb deleted file mode 100644 index fd0e24f0..00000000 --- a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019 NXP - -require firmware-qca.inc - -SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware" -DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth firmware for modules such as QCA6174A" -SECTION = "base" -LICENSE = "Proprietary" - -inherit allarch - -do_install () { - # Install firmware.conf for QCA modules - install -d ${D}${sysconfdir}/bluetooth - install -m 644 ${S}/1CQ_QCA6174A_LEA_2.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth - - # Install firmware files - install -d ${D}${base_libdir} - cp -r ${S}/1CQ_QCA6174A_LEA_2.0/lib/firmware ${D}${base_libdir} -} - -FILES_${PN} = " \ - ${sysconfdir}/bluetooth/firmware.conf \ - ${base_libdir}/firmware/qca6174 \ - ${base_libdir}/firmware/wlan \ - ${base_libdir}/firmware/* \ -" diff --git a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb new file mode 100644 index 00000000..47b289af --- /dev/null +++ b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2019-2020 NXP + +require firmware-qca.inc + +SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware" +DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth firmware for modules such as QCA6174A" +SECTION = "base" +LICENSE = "Proprietary" + +inherit allarch + +do_install () { + # Install firmware.conf for QCA modules + install -d ${D}${sysconfdir}/bluetooth + install -m 644 ${S}/1CQ_QCA6174A_LEA_2.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth + + # Install firmware files + install -d ${D}${base_libdir} + cp -r ${S}/1CQ_QCA6174A_LEA_2.0/lib/firmware ${D}${base_libdir} +} + +FILES_${PN} = " \ + ${sysconfdir}/bluetooth/firmware.conf \ + ${base_libdir}/firmware/qca6174 \ + ${base_libdir}/firmware/wlan \ + ${base_libdir}/firmware/* \ +" diff --git a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.1.bb b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.1.bb deleted file mode 100644 index a1d6b0f1..00000000 --- a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2018-2019 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_3.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth - - # Install firmware files - install -d ${D}${base_libdir} - cp -r ${S}/1PJ_QCA9377-3_LEA_3.0/lib/firmware ${D}${base_libdir} -} - -FILES_${PN} = " \ - ${sysconfdir}/bluetooth/firmware.conf \ - ${base_libdir}/firmware/qca \ - ${base_libdir}/firmware/qca9377 \ - ${base_libdir}/firmware/wlan \ -" diff --git a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb new file mode 100644 index 00000000..26c41d50 --- /dev/null +++ b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2018-2020 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_3.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth + + # Install firmware files + install -d ${D}${base_libdir} + cp -r ${S}/1PJ_QCA9377-3_LEA_3.0/lib/firmware ${D}${base_libdir} +} + +FILES_${PN} = " \ + ${sysconfdir}/bluetooth/firmware.conf \ + ${base_libdir}/firmware/qca \ + ${base_libdir}/firmware/qca9377 \ + ${base_libdir}/firmware/wlan \ +" diff --git a/recipes-bsp/firmware-qca/qca-tools_3.0.1.bb b/recipes-bsp/firmware-qca/qca-tools_3.0.1.bb deleted file mode 100644 index b7bf0dff..00000000 --- a/recipes-bsp/firmware-qca/qca-tools_3.0.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2018 NXP - -require firmware-qca.inc - -SUMMARY = "Qualcomm Wi-Fi and Bluetooth tools" -DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth tools for modules such as QCA6174A and QCA9377" -LICENSE = "Proprietary" - -DEPENDS = "libnl zlib" - -FCC_TOOLS_FOLDER ?= "qca9377_qca6174_arm32" -FCC_TOOLS_FOLDER_aarch64 = "qca9377_qca6174_arm64" - -do_install() { - install -d ${D}${sbindir}/fcc_tools - cp -r ${S}/fcc_tools/${FCC_TOOLS_FOLDER} ${D}${sbindir}/fcc_tools -} - -COMPATIBLE_HOST = '(aarch64|arm).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' diff --git a/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb b/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb new file mode 100644 index 00000000..e996c62d --- /dev/null +++ b/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb @@ -0,0 +1,20 @@ +# Copyright (C) 2018-2020 NXP + +require firmware-qca.inc + +SUMMARY = "Qualcomm Wi-Fi and Bluetooth tools" +DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth tools for modules such as QCA6174A and QCA9377" +LICENSE = "Proprietary" + +DEPENDS = "libnl zlib" + +FCC_TOOLS_FOLDER ?= "qca9377_qca6174_arm32" +FCC_TOOLS_FOLDER_aarch64 = "qca9377_qca6174_arm64" + +do_install() { + install -d ${D}${sbindir}/fcc_tools + cp -r ${S}/fcc_tools/${FCC_TOOLS_FOLDER} ${D}${sbindir}/fcc_tools +} + +COMPATIBLE_HOST = '(aarch64|arm).*-linux' +COMPATIBLE_HOST_libc-musl = 'null' -- cgit v1.2.3-54-g00ecf