[openwrt/openwrt] linux-firmware: update to 20250917

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 23 14:10:31 PDT 2025


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/2fae509a8f0ac5ca1b0b62c638898e3765f78d0e

commit 2fae509a8f0ac5ca1b0b62c638898e3765f78d0e
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Wed Sep 17 10:34:13 2025 -0400

    linux-firmware: update to 20250917
    
    Update to 20250917 in which the firmware for iwlwifi moved to
    intel/iwlwifi[1] so adjust Makefile accordingly.
    
    % git log --no-merges --pretty=oneline --abbrev-commit 20250808...20250917
    a9f26799247a amdgpu: update PSP 14.0.3 kicker firmware
    7c3980a26d68 amdgpu: update vega20 firmware
    c12707ae2dfa amdgpu: update vega12 firmware
    c8048421f579 amdgpu: update vega10 firmware
    93abdb308d30 amdgpu: update vangogh firmware
    be73284e2f7f amdgpu: update VCN 4.0.6 firmware
    eb56f5ae9199 amdgpu: update PSP 14.0.1 firmware
    9643cbf2c94e amdgpu: update GC 11.5.1 firmware
    b73c1b2f238a amdgpu: update VCN 4.0.5 firmware
    421085982a64 amdgpu: update VPE 6.1.0 firmware
    5e8da647d8a5 amdgpu: update PSP 14.0.0 firmware
    ca201f8407b6 amdgpu: update GC 11.5.0 firmware
    09dcf0ed7b45 amdgpu: update renoir firmware
    b27822eae04a amdgpu: update yellow carp firmware
    8d34604f6f2d amdgpu: update VCN 3.1.2 firmware
    2f4eba1172db amdgpu: update PSP 13.0.5 firmware
    5eb854bde3d1 amdgpu: update GC 10.3.6 firmware
    5c34be1058b0 amdgpu: update PSP 13.0.11 firmware
    8a8100c5da80 amdgpu: update GC 11.0.4 firmware
    fab8ed8fcf6c amdgpu: update VCN 4.0.2 firmware
    42eb6ad1e135 amdgpu: update PSP 13.0.4 firmware
    6c47866dee63 amdgpu: update GC 11.0.1 firmware
    7d9022b56d9f amdgpu: update VCN 5.0.0 firmware
    5cb539e8178d amdgpu: update PSP 14.0.3 firmware
    ab4867765f16 amdgpu: update GC 12.0.1 firmware
    70337b2fe2e4 amdgpu: update SMU 14.0.2 firmware
    365e86fe8eac amdgpu: update PSP 14.0.2 firmware
    98306ae95355 amdgpu: update GC 12.0.0 firmware
    618e92a7582f amdgpu: update VCN 4.0.4 firmware
    377cde4784d3 amdgpu: update PSP 13.0.7 firmware
    90ef164e2a20 amdgpu: update GC 11.0.2 firmware
    068b1b886ad7 amdgpu: update SMU 13.0.10 firmware
    ef230a82c77a amdgpu: update PSP 13.0.10 firmware
    981df0011104 amdgpu: update GC 11.0.3 firmware
    c5bd5d23d026 amdgpu: update SMU 13.0.0 kicker firmware
    49b6d2db05a7 amdgpu: update PSP 13.0.0 kicker firmware
    85014781be88 amdgpu: update VCN 4.0.0 firmware
    c7beb200e2f8 amdgpu: update SDMA 6.0.0 firmware
    dfa8be4ec1bb amdgpu: update SMU 13.0.0 firmware
    154e8d1559f6 amdgpu: update PSP 13.0.0 firmware
    7dea59d23b92 amdgpu: update GC 11.0.0 firmware
    d54c5a4464d7 amdgpu: update beige goby firmware
    ba313d87e661 amdgpu: update dimgrey cavefish firmware
    1dac1ae8da5a amdgpu: update navy flounder firmware
    edb255ec5799 amdgpu: update sienna cichlid firmware
    05bf27466308 amdgpu: update navi14 firmware
    f33198f1d3c6 amdgpu: update navi12 firmware
    6b9312de248b amdgpu: update navi10 firmware
    0eb298e1924a amdgpu: update VCN 5.0.1 firmware
    263fa1962fb3 amdgpu: update PSP 13.0.12 firmware
    45c28bd13927 amdgpu: update GC 9.5.0 firmware
    eeb986988f69 amdgpu: update PSP 13.0.14 firmware
    38b7298d5671 amdgpu: update GC 9.4.4 firmware
    8de2474118bf amdgpu: update SDMA 6.1.3 firmware
    bdacedf28cb7 amdgpu: update PSP 14.0.5 firmware
    c3407118c53c amdgpu: update GC 11.5.3 firmware
    59cac4434cb7 amdgpu: update VPE 6.1.3 firmware
    06d251853d09 amdgpu: update PSP 14.0.4 firmware
    6e5828de499d amdgpu: update GC 11.5.2 firmware
    16e06e599952 amdgpu: update green sardine firmware
    5697f5139f6c amdgpu: update VCN 4.0.3 firmware
    5ce8c510e174 amdgpu: update PSP 13.0.6 firmware
    8caace3229c5 amdgpu: update GC 9.4.3 firmware
    149f9b8e3422 linux-firmware: update firmware for en8811h 2.5G ethernet phy
    ba7d706f9cf6 amdgpu: DMCUB updates for various ASICs
    96fa6d9157ea intel/ish: Add firmware for LENOVO THINKPAD X1 2-in-1 Gen 10
    ac27fb925034 mediatek MT7922: update bluetooth firmware to 20250903123504
    ba41835c21eb linux-firmware: update firmware for MT7922 WiFi device
    0732a4c4958a qcom: move Monaco EVK topology from qcs8275 to qcs8300 subdir
    1135eb435b7b qcom: Add Audio topology for MONACO-EVK
    abf91414e840 qcom: add CDSP firmware for qcs615 platform
    22990e4c616e qcom: Add Audio topology for LEMANS-EVK
    1c44d84a08bf ath12k: WCN7850 hw2.0 at ncm865: add to WLAN.IOE_HMT.1.1-00018-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
    f4bff0fc25cb linux-firmware: update firmware for MT7925 WiFi device
    7278ab0e55cf mediatek MT7925:update bluetooth firmware to 20250825220109 Update binary firmware for MT7925 BT devices.
    d9e126112daa qcom: vpu: update firmware binaries to fix encoder drain handling
    6400e0ed82a6 intel_vpu: Update NPU firmware
    739c7638b982 Revert "cs35l56: Rename firmware for Thinkbook 16P Gen6 (17AA3921) without multiple speakers"
    bd28704ab16e cs35l56: Rename firmware for Thinkbook 16P Gen6 (17AA3921) without multiple speakers
    d2f41cc246ba xe: Update GUC to v70.49.4 for BMG, LNL, PTL
    20cf22e50252 i915: Update GUC to v70.49.4 for ADL-P, DG1, DG2, MTL, TGL
    4897d80cce5f qcom: add ADSP firmware for qcs615 platform
    ed1c122b2a42 rtl_bt: Update RTL8822C BT USB firmware to 0x2B66_D962
    91fd5ffa1510 iwlwifi: add Bz-HR FW for core90-93 release
    dbe75f7ca712 Fix link entry for qat_895xcc.bin
    06205c0eb81a Move QAT firmware to intel/ subdirectory
    078946281c84 Move all iwlwifi top level files to intel/ directory
    ef42281a3aaf Revert "intel/ish: Add firmware for LENOVO THINKPAD X1 2-in-1 Gen 10"
    0cfc1632ef7b ath11k: Support WCN6855 hw2.1 with NFA firmware variant
    a89515d3ff79 amdgpu: Update ISP FW for isp v4.1.1
    3b7a8ca912ab Update README.md to clarify S-o-b requirements
    5ca18e346401 firmware: qcom: Reorder VPU firmware entries in WHENCE
    409b3cea3097 intel_vpu: Update NPU firmware
    a4a827849a58 amdgpu: DMCUB updates for various ASICs
    82045de5e845 intel/ish: Add firmware for LENOVO THINKPAD X1 2-in-1 Gen 10
    fa855bd9ece7 cirrus: cs35l41: Move entries to correct driver section in WHENCE
    be22069598e3 cirrus: cs35l56: Update firmware for Cirrus Amps for some Lenovo laptops
    71b945d2190c ath11k: WCN6855 hw2.0 at nfa765: add to WLAN.HSP.1.1-04685-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1
    c6a9ced69823 cirrus: cs35l56: Add firmware for Cirrus Amps for some Lenovo laptops
    ece445af91bb qcom: Add firmware binary for SM8650.
    5b0934ba6192 Link rtl8723b_config.bin to rtl8723bs
    feb33add04d9 rtw89: 8922a: update fw to v0.35.80.3
    ba3e128340cf rtw89: 8852c: update fw to v0.27.129.4
    ee5228bfe181 rtw89: 8852c: update fw to v0.27.129.3
    2907133be681 qcom: add CDSP firmware for x1e80100 platform
    b5b78dda06f9 iwlwifi: add Bz/gl FW for core97-84 release
    70fce2e71a3c iwlwifi: update ty/So/Ma firmwares for core97-84 release
    b19b3cf8e414 iwlwifi: update cc/Qu/QuZ firmwares for core97-84 release
    2bf6ab128f0b amdgpu: DMCUB updates for various ASICs
    3a12b0fec4be realtek: rt1321: Add patch firmware of MCU
    5260f2873636 mediatek: Add MT8189 SCP firmware
    d0fb4a8f2da4 amdgpu: DMCUB updates for various ASICs
    930ef9046e38 panthor: Add firmware for more Mali GPUs
    d986d065ae7b amdgpu: update renoir firmware
    9897853cea76 amdgpu: add SMU 14.0.3 kicker firmware
    bd5906138f51 amdgpu: add PSP 14.0.3 firmware
    29a5e75e5ddd amdgpu: add GC 12.0.1 kicker firmware
    a0278b8ba301 amdgpu: update navy flounder firmware
    001f18e5b9b2 amdgpu: update SDMA 6.1.2 firmware
    4d2ae0f5205b amdgpu: update PSP 14.0.4 firmware
    674f8b1dafa9 amdgpu: update GC 11.5.2 firmware
    fd7de77c5998 amdgpu: update yellow carp firmware
    baff98c457a0 amdgpu: update VCN 5.0.0 firmware
    0a5ac406dbb7 amdgpu: update SDMA 7.0.1 firmware
    06f096fc40b5 amdgpu: update PSP 14.0.3 firmware
    66a604e1406b amdgpu: update GC 12.0.1 firmware
    b2d4246e1547 amdgpu: update sienna cichlid firmware
    a48f75acdb3d amdgpu: update vega20 firmware
    c3b4c3880492 amdgpu: update SDMA 7.0.0 firmware
    f87d250299da amdgpu: update PSP 14.0.2 firmware
    b53bcd8ac757 amdgpu: update GC 12.0.0 firmware
    5bcadbbec2a5 amdgpu: update vega12 firmware
    db8456fde4ec amdgpu: update vega10 firmware
    e3998061416e amdgpu: update VCN 3.1.2 firmware
    f98da641b72d amdgpu: update PSP 13.0.5 firmware
    8614f13eca99 amdgpu: update GC 10.3.6 firmware
    740f17080a5c amdgpu: update VCN 4.0.4 firmware
    b1534c2e2fa5 amdgpu: update SDMA 6.0.2 firmware
    a911fa376d7a amdgpu: update PSP 13.0.7 firmware
    5a33df773db8 amdgpu: update GC 11.0.2 firmware
    df03c98de76d amdgpu: update navi14 firmware
    fe2338805ef5 amdgpu: update SDMA 6.0.3 firmware
    516b41a37410 amdgpu: update PSP 13.0.10 firmware
    b863bcee224e amdgpu: update GC 11.0.3 firmware
    1b0815132267 amdgpu: update navi12 firmware
    41c111e7e5b7 amdgpu: update vangogh firmware
    d626db731b04 amdgpu: update navi10 firmware
    c48f3cf6d95a amdgpu: update PSP 13.0.0 kicker firmware
    f3d5f44b2a07 amdgpu: update VCN 5.0.1 firmware
    86eb91a2f97f amdgpu: update PSP 13.0.12 firmware
    4baea1265aaa amdgpu: update GC 9.5.0 firmware
    9a71965f82b6 amdgpu: update VCN 4.0.0 firmware
    6a33949aace4 amdgpu: update SDMA 6.0.0 firmware
    839eaca8a5d7 amdgpu: update GC 11.0.0 firmware
    6b4062a2e25c amdgpu: update PSP 13.0.14 firmware
    9c0e99a54789 amdgpu: update PSP 13.0.6 firmware
    09c3e7a1ca34 amdgpu: update GC 9.4.3 firmware
    6893d17b30d7 amdgpu: update vpe 6.1.1 firmware
    85c7640cc83c amdgpu: update VCN 4.0.6 firmware
    61c473cf6829 amdgpu: update SDMA 6.1.1 firmware
    2cef366f6aba amdgpu: update PSP 14.0.1 firmware
    5e35839d7b4c amdgpu: update GC 11.5.1 firmware
    448a3efa17f9 amdgpu: update PSP 13.0.11 firmware
    3c7c3487dbd3 amdgpu: update GC 11.0.4 firmware
    ff54f49cd41e amdgpu: update beige goby firmware
    442449670be7 amdgpu: update PSP 13.0.8 firmware
    fd27c247e5bf amdgpu: update GC 10.3.7 firmware
    397a1b97fc36 amdgpu: update VCN 4.0.5 firmware
    f70084acf5f1 amdgpu: update PSP 14.0.0 firmware
    dfa4987b55b9 amdgpu: update GC 11.5.0 firmware
    6e59320c3bf3 amdgpu: update VCN 4.0.2 firmware
    2e1460fdad15 amdgpu: update SDMA 6.0.1 firmware
    426a9d94e6cc amdgpu: update PSP 13.0.4 firmware
    5271eb7f6674 amdgpu: update GC 11.0.1 firmware
    0d8518ea7368 amdgpu: update dimgrey_cavefish firmware
    11c4ebf4c4a2 amdgpu: update aldebaran firmware
    0239fb7f728a qca: Update Bluetooth WCN6750 1.1.3-00069 firmware to 1.1.3-00091
    
    Build system: x86/64
    Build-tested: x86/64-glibc
    Run-tested: x86/64-glibc (Intel N150 PC)
    
    1. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=078946281c84e8477222e51f29416439a037d83d
    
    Co-authored-by: Leo Barsky <leobrsky at proton.me>
    Signed-off-by: John Audia <therealgraysky at proton.me>
    Link: https://github.com/openwrt/openwrt/pull/20072
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/firmware/linux-firmware/Makefile      |  4 +-
 package/firmware/linux-firmware/intel.mk      | 64 +++++++++++++--------------
 package/firmware/linux-firmware/qca_ath11k.mk |  4 +-
 package/firmware/linux-firmware/qca_ath12k.mk |  4 +-
 4 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
index 190703b78a..b03f0f3060 100644
--- a/package/firmware/linux-firmware/Makefile
+++ b/package/firmware/linux-firmware/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linux-firmware
-PKG_VERSION:=20250808
+PKG_VERSION:=20250917
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=c029551b45a15926c9d7a5df1a0b540044064f19157c57fc11d91fd0aade837f
+PKG_HASH:=120575b756915a11e736f599316a756b6a29a76d6135ad86208868b21c58fb75
 
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
index c94ec002fb..052e32cde4 100644
--- a/package/firmware/linux-firmware/intel.mk
+++ b/package/firmware/linux-firmware/intel.mk
@@ -21,206 +21,206 @@ $(eval $(call BuildPackage,ice-firmware))
 Package/iwl3945-firmware = $(call Package/firmware-default,Intel IWL3945 firmware)
 define Package/iwl3945-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3945-2.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwl3945-firmware))
 
 Package/iwl4965-firmware = $(call Package/firmware-default,Intel IWL4965 firmware)
 define Package/iwl4965-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-4965-2.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwl4965-firmware))
 
 Package/iwlwifi-firmware-iwl100 = $(call Package/firmware-default,Intel Centrino Wireless-N 100 firmware)
 define Package/iwlwifi-firmware-iwl100/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-100-5.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl100))
 
 Package/iwlwifi-firmware-iwl1000 = $(call Package/firmware-default,Intel Centrino Wireless-N 1000 firmware)
 define Package/iwlwifi-firmware-iwl1000/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-1000-5.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl1000))
 
 Package/iwlwifi-firmware-iwl105 = $(call Package/firmware-default,Intel Centrino Wireless-N 105 firmware)
 define Package/iwlwifi-firmware-iwl105/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-105-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-105-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl105))
 
 Package/iwlwifi-firmware-iwl135 = $(call Package/firmware-default,Intel Centrino Wireless-N 135 firmware)
 define Package/iwlwifi-firmware-iwl135/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-135-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-135-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl135))
 
 Package/iwlwifi-firmware-iwl2000 = $(call Package/firmware-default,Intel Centrino Wireless-N 2200 firmware)
 define Package/iwlwifi-firmware-iwl2000/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-2000-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl2000))
 
 Package/iwlwifi-firmware-iwl2030 = $(call Package/firmware-default,Intel Centrino Wireless-N 2230 firmware)
 define Package/iwlwifi-firmware-iwl2030/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-2030-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl2030))
 
 Package/iwlwifi-firmware-iwl3160 = $(call Package/firmware-default,Intel Wireless 3160 firmware)
 define Package/iwlwifi-firmware-iwl3160/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3160-17.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3160-17.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl3160))
 
 Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware)
 define Package/iwlwifi-firmware-iwl3168/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-3168-29.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl3168))
 
 Package/iwlwifi-firmware-iwl5000 = $(call Package/firmware-default,Intel Wireless 5100AGN 5300AGN and 5350AGN firmware)
 define Package/iwlwifi-firmware-iwl5000/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-5000-5.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl5000))
 
 Package/iwlwifi-firmware-iwl5150 = $(call Package/firmware-default,Intel Wireless Wi-Fi 5150AGN firmware)
 define Package/iwlwifi-firmware-iwl5150/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-5150-2.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl5150))
 
 Package/iwlwifi-firmware-iwl6000g2 = $(call Package/firmware-default,Intel Centrino 6300 and 6200 firmware)
 define Package/iwlwifi-firmware-iwl6000g2/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000-4.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2))
 
 Package/iwlwifi-firmware-iwl6000g2a = $(call Package/firmware-default,Intel Centrino 6205 firmware)
 define Package/iwlwifi-firmware-iwl6000g2a/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2a))
 
 Package/iwlwifi-firmware-iwl6000g2b = $(call Package/firmware-default,Intel Centrino 6230 1030 130 and 6235 firmware)
 define Package/iwlwifi-firmware-iwl6000g2b/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2b))
 
 Package/iwlwifi-firmware-iwl6050 = $(call Package/firmware-default,Intel Centrino 6150 and 6250 firmware)
 define Package/iwlwifi-firmware-iwl6050/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-6050-5.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl6050))
 
 Package/iwlwifi-firmware-iwl7260 = $(call Package/firmware-default,Intel Wireless 7260 firmware)
 define Package/iwlwifi-firmware-iwl7260/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7260-17.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7260-17.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl7260))
 
 Package/iwlwifi-firmware-iwl7265 = $(call Package/firmware-default,Intel Wireless 7265 firmware)
 define Package/iwlwifi-firmware-iwl7265/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265-17.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7265-17.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl7265))
 
 Package/iwlwifi-firmware-iwl7265d = $(call Package/firmware-default,Intel Wireless 7265D and 3165 firmware)
 define Package/iwlwifi-firmware-iwl7265d/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265D-29.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-7265D-29.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl7265d))
 
 Package/iwlwifi-firmware-iwl8260c = $(call Package/firmware-default,Intel Wireless 8260 and 4165 firmware)
 define Package/iwlwifi-firmware-iwl8260c/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8000C-36.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-8000C-36.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl8260c))
 
 Package/iwlwifi-firmware-iwl8265 = $(call Package/firmware-default,Intel Wireless 8265 firmware)
 define Package/iwlwifi-firmware-iwl8265/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8265-36.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-8265-36.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl8265))
 
 Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware)
 define Package/iwlwifi-firmware-iwl9000/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl9000))
 
 Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware)
 define Package/iwlwifi-firmware-iwl9260/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260))
 
 Package/iwlwifi-firmware-ax101 = $(call Package/firmware-default,Intel AX101 firmware)
 define Package/iwlwifi-firmware-ax101/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-hr-b0-89.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-hr-b0-89.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax101))
 
 Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware)
 define Package/iwlwifi-firmware-ax200/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-77.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-cc-a0-77.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax200))
 
 Package/iwlwifi-firmware-ax201 = $(call Package/firmware-default,Intel AX201 firmware)
 define Package/iwlwifi-firmware-ax201/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-QuZ-a0-hr-b0-77.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-QuZ-a0-hr-b0-77.ucode $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax201))
 
 Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware)
 define Package/iwlwifi-firmware-ax210/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-89.ucode $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-ty-a0-gf-a0-89.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax210))
 
 Package/iwlwifi-firmware-ax411 = $(call Package/firmware-default,Intel AX411 firmware)
 define Package/iwlwifi-firmware-ax411/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-gf4-a0-89.ucode $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-gf4-a0.pnvm $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-gf4-a0-89.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-so-a0-gf4-a0.pnvm $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax411))
 
 Package/iwlwifi-firmware-be200 = $(call Package/firmware-default,Intel BE200 firmware)
 define Package/iwlwifi-firmware-be200/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-gl-c0-fm-c0-98.ucode $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-gl-c0-fm-c0.pnvm $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-gl-c0-fm-c0-98.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/intel/iwlwifi/iwlwifi-gl-c0-fm-c0.pnvm $(1)/lib/firmware
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-be200))
 
diff --git a/package/firmware/linux-firmware/qca_ath11k.mk b/package/firmware/linux-firmware/qca_ath11k.mk
index a06bcda420..a700383610 100644
--- a/package/firmware/linux-firmware/qca_ath11k.mk
+++ b/package/firmware/linux-firmware/qca_ath11k.mk
@@ -30,7 +30,9 @@ Package/ath11k-firmware-wcn6855 = $(call Package/firmware-default,WCN6855 ath11k
 define Package/ath11k-firmware-wcn6855/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/* $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
+		$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/*.bin $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/*.txt $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
 	$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
 endef
 $(eval $(call BuildPackage,ath11k-firmware-wcn6855))
diff --git a/package/firmware/linux-firmware/qca_ath12k.mk b/package/firmware/linux-firmware/qca_ath12k.mk
index 4f0a3d6bf1..baad1fcf3b 100644
--- a/package/firmware/linux-firmware/qca_ath12k.mk
+++ b/package/firmware/linux-firmware/qca_ath12k.mk
@@ -2,7 +2,9 @@ Package/ath12k-firmware-wcn7850 = $(call Package/firmware-default,WCN7850 ath12k
 define Package/ath12k-firmware-wcn7850/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/WCN7850/hw2.0
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/* $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
+		$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/*.bin $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/ath12k/WCN7850/hw2.0/*.txt $(1)/lib/firmware/ath12k/WCN7850/hw2.0/
 endef
 $(eval $(call BuildPackage,ath12k-firmware-wcn7850))
 




More information about the lede-commits mailing list