1 files changed, 13 insertions, 44 deletions

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
index 80c94c5db3..b932300742 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
@@ -398,7 +398,8 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-ath12k-wcn7850 \
              ${PN}-ath12k-misc \
              ${PN}-qca \
-             ${PN}-qca-qca61x4 \
+             ${PN}-qca-qca61x4-serial \
+             ${PN}-qca-qca61x4-usb \
              ${PN}-qca-qca6390 \
              ${PN}-qca-wcn3988 \
              ${PN}-qca-wcn399x \
@@ -591,7 +592,8 @@ LICENSE:${PN}-ath12k = "Firmware-qualcommAthos_ath10k"
 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-qca61x4-serial = "Firmware-qualcommAthos_ath10k"
+LICENSE:${PN}-qca-qca61x4-usb = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-qca6390 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-wcn3988 = "Firmware-qcom"
 LICENSE:${PN}-qca-wcn399x = "Firmware-qualcommAthos_ath10k"
@@ -646,47 +648,13 @@ ALLOW_EMPTY:${PN}-ath12k = "1"
 # firmwares that are not already included in other -ath12k- packages.
 ALLOW_EMPTY:${PN}-ath12k-misc = "1"
 
-FILES:${PN}-qca-qca61x4 = " \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00000201.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00000200.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00000300.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00000302.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_00130300.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_00130302.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_00230302.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00000200.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00000201.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00000300.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00000302.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_00130300.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_00130302.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_00230302.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_00440302.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_00440302.bin \
-  ${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/rampatch_usb_00130200.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0104.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0105.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0106.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0107.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0109.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130200_0110.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00130201.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_010a.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_010b.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_0303.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_gf.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_gf_010a.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_gf_010b.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00130201_gf_0303.bin \
-  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_00190200.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00190200.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00190200_010e.bin \
-  ${nonarch_base_libdir}/firmware/qca/nvm_usb_00190200_0112.bin \
+FILES:${PN}-qca-qca61x4-serial = " \
+  ${nonarch_base_libdir}/firmware/qca/nvm_0*.bin \
+  ${nonarch_base_libdir}/firmware/qca/rampatch_0*.bin \
+"
+FILES:${PN}-qca-qca61x4-usb = " \
+  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_*.bin \
+  ${nonarch_base_libdir}/firmware/qca/rampatch_usb_*.bin \
 "
 FILES:${PN}-qca-qca6390 = " \
   ${nonarch_base_libdir}/firmware/qca/htbtfw20.tlv \
@@ -786,7 +754,8 @@ RDEPENDS:${PN}-ath12k-qcn9274 += "${PN}-ath10k-license"
 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-qca61x4-serial += "${PN}-ath10k-license"
+RDEPENDS:${PN}-qca-qca61x4-usb += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-qca6390 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-wcn3988 += "${PN}-qcom-license"
 RDEPENDS:${PN}-qca-wcn399x += "${PN}-ath10k-license"