From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Sat, 1 Feb 2025 08:58:56 +0000 (+0200)
Subject: linux-firmware: split the qca6390 firmware
X-Git-Tag: yocto-5.2~641
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a846d72e9e53dfdaf4d5dd66c94b9323c1a580e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

linux-firmware: split the qca6390 firmware

The HCI firmware for the QCA6390 BT/WiFi chips doesn't logically belong
to the USB-only linux-firmware-qca-qca61x4 package. Split it to the
separate package in order to simplify firmware management. This follows
the pending WHENCE change in the linux-firmware upstream, where the
QCA6390 firmware is split to a separate section.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
index 3d22b25ef09..b153901d65f 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
@@ -399,6 +399,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-ath12k-misc \
              ${PN}-qca \
              ${PN}-qca-qca61x4 \
+             ${PN}-qca-qca6390 \
              ${PN}-qca-wcn3988 \
              ${PN}-qca-wcn399x \
              ${PN}-qca-wcn6750 \
@@ -591,6 +592,7 @@ LICENSE:${PN}-ath12k-qcn9274 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath12k-wcn7850 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath12k-misc = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-qca61x4 = "Firmware-qualcommAthos_ath10k"
+LICENSE:${PN}-qca-qca6390 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-wcn3988 = "Firmware-qcom"
 LICENSE:${PN}-qca-wcn399x = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-wcn6750 = "Firmware-qualcommAthos_ath10k"
@@ -664,8 +666,6 @@ FILES:${PN}-qca-qca61x4 = " \
   ${nonarch_base_libdir}/firmware/qca/nvm_00440302_eu.bin \
   ${nonarch_base_libdir}/firmware/qca/nvm_00440302_i2s_eu.bin \
   ${nonarch_base_libdir}/firmware/qca/nvm_usb_00000302_eu.bin \
-  ${nonarch_base_libdir}/firmware/qca/htbtfw20.tlv \
-  ${nonarch_base_libdir}/firmware/qca/htnv20.bin \
   ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00130200.bin \
   ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200.bin \
   ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0104.bin \
@@ -688,6 +688,10 @@ FILES:${PN}-qca-qca61x4 = " \
   ${nonarch_base_libdir}/firmware/qca/nvm_usb_00190200_010e.bin \
   ${nonarch_base_libdir}/firmware/qca/nvm_usb_00190200_0112.bin \
 "
+FILES:${PN}-qca-qca6390 = " \
+  ${nonarch_base_libdir}/firmware/qca/htbtfw20.tlv \
+  ${nonarch_base_libdir}/firmware/qca/htnv20.bin \
+"
 FILES:${PN}-qca-wcn3988 = " \
   ${nonarch_base_libdir}/firmware/qca/apbtfw10.tlv \
   ${nonarch_base_libdir}/firmware/qca/apbtfw11.tlv \
@@ -783,6 +787,7 @@ RDEPENDS:${PN}-ath12k-wcn7850 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath12k-misc += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca += "${PN}-ath10k-license ${PN}-qcom-license"
 RDEPENDS:${PN}-qca-qca61x4 += "${PN}-ath10k-license"
+RDEPENDS:${PN}-qca-qca6390 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-wcn3988 += "${PN}-qcom-license"
 RDEPENDS:${PN}-qca-wcn399x += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-wcn6750 += "${PN}-ath10k-license"