X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=assemble-firmware.pl;h=434bf9f802a498babb56b2c62d24e7de4e887b5d;hb=HEAD;hp=e4510da6eeca8ba561c45d89ca8fdeb24f3ab2dc;hpb=433982b11166a94fec88fdb5aa2dbd087edba67b;p=pve-firmware.git

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index e4510da..dc90643 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -1,11 +1,11 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
+use warnings;
+
 use File::Basename;
 use File::Path;
 
-my $fwsrc0 = "linux-2.6-3.10.0/firmware";
-my $fwsrc1 = "linux-firmware.git";
 my $fwsrc2 = "dvb-firmware.git";
 my $fwsrc3 = "firmware-misc";
 
@@ -15,25 +15,59 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
 my $target = shift;
 die "no target directory" if !$target || ! -d $target;
 
-my $force_skip = {
-
-    # not needed, the HBA has burned-in firmware
-    'ql2600_fw.bin' => 1,
-    'ql2700_fw.bin' => 1,
-    'ql8100_fw.bin' => 1,
-    'ql8300_fw.bin' => 1,
-};
+my $FORCE_INCLUDE = [
+    'iwlwifi-*.pnvm',
+];
 
-my $skip = {};
+my $ALLOW_MISSING = {};
 # debian squeeze also misses those files
 foreach my $fw (qw(
 3826.arm
+3826.eeprom
 BT3CPCC.bin
 FW10
 FW13
+RTL8192E/boot.img
+RTL8192E/data.img
+RTL8192E/main.img
 RTL8192U/boot.img
 RTL8192U/data.img
 RTL8192U/main.img
+adf7242_firmware.bin
+amdgpu/aldebaran_cap.bin
+amdgpu/cyan_skillfish_ce.bin
+amdgpu/cyan_skillfish_me.bin
+amdgpu/cyan_skillfish_mec.bin
+amdgpu/cyan_skillfish_mec2.bin
+amdgpu/cyan_skillfish_pfp.bin
+amdgpu/cyan_skillfish_rlc.bin
+amdgpu/cyan_skillfish_sdma.bin
+amdgpu/cyan_skillfish_sdma1.bin
+amdgpu/dcn_3_5_dmcub.bin
+amdgpu/gc_11_0_0_toc.bin
+amdgpu/gc_11_0_3_mes.bin
+amdgpu/gc_11_5_0_imu.bin
+amdgpu/gc_11_5_0_me.bin
+amdgpu/gc_11_5_0_mec.bin
+amdgpu/gc_11_5_0_mes1.bin
+amdgpu/gc_11_5_0_mes_2.bin
+amdgpu/gc_11_5_0_pfp.bin
+amdgpu/gc_11_5_0_rlc.bin
+amdgpu/ip_discovery.bin
+amdgpu/navi10_mes.bin
+amdgpu/navi12_cap.bin
+amdgpu/psp_14_0_0_ta.bin
+amdgpu/psp_14_0_0_toc.bin
+amdgpu/sdma_6_1_0.bin
+amdgpu/sienna_cichlid_cap.bin
+amdgpu/sienna_cichlid_mes.bin
+amdgpu/sienna_cichlid_mes1.bin
+amdgpu/smu_14_0_2.bin
+amdgpu/vangogh_gpu_info.bin
+amdgpu/vcn_4_0_5.bin
+amdgpu/vega10_cap.bin
+amdgpu/vpe_6_1_0.bin
+amdgpu/yellow_carp_gpu_info.bin
 ar9170.fw
 ast_dp501_fw.bin
 ath10k/QCA6174/hw2.1/firmware-4.bin
@@ -53,6 +87,7 @@ ath6k/AR6004/hw1.1/bdata.bin
 ath6k/AR6004/hw1.1/fw.ram.bin
 ath6k/AR6004/hw1.2/fw.ram.bin
 ath6k/AR6004/hw1.3/fw.ram.bin
+atmsar11.fw
 b43/ucode11.fw
 b43/ucode13.fw
 b43/ucode14.fw
@@ -73,6 +108,16 @@ b43/ucode9.fw
 b43legacy/ucode2.fw
 b43legacy/ucode4.fw
 bfubase.frm
+brcm/brcmbt4377*.bin
+brcm/brcmbt4377*.ptb
+brcm/brcmbt4378*.bin
+brcm/brcmbt4378*.ptb
+brcm/brcmbt4387*.bin
+brcm/brcmbt4387*.ptb
+brcm/brcmfmac*-pcie.*.clm_blob
+brcm/brcmfmac*-pcie.*.txcap_blob
+brcm/brcmfmac*-pcie.txt
+brcm/brcmfmac*-sdio.*.bin
 brcm/brcmfmac-sdio.bin
 brcm/brcmfmac-sdio.txt
 brcm/brcmfmac43143-sdio.txt
@@ -87,21 +132,47 @@ brcm/brcmfmac4335-sdio.txt
 brcm/brcmfmac43362-sdio.txt
 brcm/brcmfmac4339-sdio.txt
 brcm/brcmfmac43430-sdio.txt
+brcm/brcmfmac43430b0-sdio.bin
+brcm/brcmfmac43439-sdio.bin
+brcm/brcmfmac43439-sdio.clm_blob
 brcm/brcmfmac43455-sdio.txt
+brcm/brcmfmac43456-sdio.bin
 brcm/brcmfmac4350-pcie.txt
 brcm/brcmfmac4354-pcie.bin
 brcm/brcmfmac4354-pcie.txt
 brcm/brcmfmac4354-sdio.txt
+brcm/brcmfmac4355-pcie.bin
+brcm/brcmfmac4355-pcie.clm_blob
+brcm/brcmfmac4355c1-pcie.bin
+brcm/brcmfmac4355c1-pcie.clm_blob
 brcm/brcmfmac4356-pcie.txt
 brcm/brcmfmac43570-pcie.txt
 brcm/brcmfmac4358-pcie.txt
 brcm/brcmfmac4359-pcie.bin
+brcm/brcmfmac4359-sdio.bin
+brcm/brcmfmac4359c-pcie.bin
 brcm/brcmfmac43602-pcie.txt
+brcm/brcmfmac4364-pcie.bin
+brcm/brcmfmac4364b2-pcie.bin
+brcm/brcmfmac4364b2-pcie.clm_blob
+brcm/brcmfmac4364b3-pcie.bin
+brcm/brcmfmac4364b3-pcie.clm_blob
 brcm/brcmfmac4365b-pcie.bin
 brcm/brcmfmac4365b-pcie.txt
 brcm/brcmfmac4365c-pcie.bin
 brcm/brcmfmac4366b-pcie.txt
 brcm/brcmfmac4371-pcie.txt
+brcm/brcmfmac43752-sdio.bin
+brcm/brcmfmac43752-sdio.clm_blob
+brcm/brcmfmac4377b3-pcie.bin
+brcm/brcmfmac4377b3-pcie.clm_blob
+brcm/brcmfmac4378b1-pcie.bin
+brcm/brcmfmac4378b1-pcie.clm_blob
+brcm/brcmfmac4378b3-pcie.bin
+brcm/brcmfmac4378b3-pcie.clm_blob
+brcm/brcmfmac4387c2-pcie.bin
+brcm/brcmfmac4387c2-pcie.clm_blob
+brcm/brcmfmac89459-pcie.bin
 c218tunx.cod
 c320tunx.cod
 cbfw-3.0.3.1.bin
@@ -115,11 +186,32 @@ ctfw.bin
 cxgb4/t4fw-1.3.10.0.bin
 cyzfirm.bin
 daqboard2000_firmware.bin
+dvb_driver_si2141_rom60.fw
+dvb_driver_si2141_rom61.fw
+dvb_driver_si2146_rom11.fw
+dvb_driver_si2147_rom50.fw
+dvb_driver_si2148_rom32.fw
+dvb_driver_si2148_rom33.fw
+dvb_driver_si2157_rom50.fw
+dvb_driver_si2158_rom51.fw
+dvb_driver_si2177_rom50.fw
+dvb_driver_si2178_rom50.fw
 fw.ram.bin
+habanalabs/gaudi/gaudi-boot-fit.itb
+habanalabs/gaudi/gaudi-fit.itb
+habanalabs/gaudi/gaudi_tpc.bin
+hcwamc.rbf
 i1480-phy-0.0.bin
 i1480-pre-phy-0.0.bin
 i1480-usb-0.0.bin
 i2400m-fw-sdio-1.3.sbcf
+i2400m-fw-usb-1.5.sbcf
+i6050-fw-usb-1.5.sbcf
+idt82p33xxx.bin
+inside-secure/eip197b/ifpp.bin
+inside-secure/eip197b/ipue.bin
+inside-secure/eip197d/ifpp.bin
+inside-secure/eip197d/ipue.bin
 isi4608.bin
 isi4616.bin
 isi608.bin
@@ -135,6 +227,7 @@ iwlwifi-130-5.ucode
 iwlwifi-3165-10.ucode
 iwlwifi-3168-26.ucode
 iwlwifi-6000-6.ucode
+iwlwifi-6000g2b-IWL6000G2B_UCODE_API_MAX.ucode
 iwlwifi-7265D-26.ucode
 iwlwifi-8000-10.ucode
 iwlwifi-8000-12.ucode
@@ -147,25 +240,179 @@ iwlwifi-8265-33.ucode
 iwlwifi-9000-pu-a0-jf-a0--26.ucode
 iwlwifi-9000-pu-a0-jf-a0--33.ucode
 iwlwifi-9000-pu-a0-jf-a0-34.ucode
+iwlwifi-9000-pu-a0-jf-a0-43.ucode
 iwlwifi-9000-pu-a0-jf-b0--33.ucode
 iwlwifi-9000-pu-a0-jf-b0-34.ucode
+iwlwifi-9000-pu-a0-jf-b0-43.ucode
 iwlwifi-9000-pu-a0-lc-a0--26.ucode
 iwlwifi-9260-th-a0-jf-a0--26.ucode
 iwlwifi-9260-th-a0-jf-a0--33.ucode
 iwlwifi-9260-th-a0-jf-a0-34.ucode
+iwlwifi-9260-th-a0-jf-a0-43.ucode
 iwlwifi-9260-th-b0-jf-b0--33.ucode
+iwlwifi-BzBnj-a0-fm-a0-72.ucode
+iwlwifi-BzBnj-a0-fm4-a0-72.ucode
+iwlwifi-BzBnj-a0-gf-a0-72.ucode
+iwlwifi-BzBnj-a0-gf4-a0-72.ucode
+iwlwifi-BzBnj-a0-hr-b0-72.ucode
+iwlwifi-BzBnj-b0-fm-b0-72.ucode
 iwlwifi-Qu-a0-hr-a0--33.ucode
 iwlwifi-Qu-a0-hr-a0-34.ucode
+iwlwifi-Qu-a0-hr-a0-43.ucode
+iwlwifi-Qu-a0-hr-a0-48.ucode
+iwlwifi-Qu-a0-hr-a0-50.ucode
 iwlwifi-Qu-a0-jf-b0--26.ucode
 iwlwifi-Qu-a0-jf-b0--33.ucode
 iwlwifi-Qu-a0-jf-b0-34.ucode
+iwlwifi-Qu-a0-jf-b0-43.ucode
+iwlwifi-Qu-a0-jf-b0-48.ucode
+iwlwifi-Qu-a0-jf-b0-50.ucode
+iwlwifi-Qu-b0-hr-b0-43.ucode
+iwlwifi-Qu-b0-jf-b0-43.ucode
 iwlwifi-QuQnj-a0-hr-a0-34.ucode
+iwlwifi-QuQnj-a0-hr-a0-43.ucode
+iwlwifi-QuQnj-a0-hr-a0-48.ucode
+iwlwifi-QuQnj-a0-hr-a0-50.ucode
 iwlwifi-QuQnj-a0-jf-b0-34.ucode
+iwlwifi-QuQnj-a0-jf-b0-43.ucode
+iwlwifi-QuQnj-b0-hr-b0-43.ucode
+iwlwifi-QuQnj-b0-hr-b0-48.ucode
+iwlwifi-QuQnj-b0-hr-b0-50.ucode
+iwlwifi-QuQnj-b0-hr-b0-59.ucode
+iwlwifi-QuQnj-b0-hr-b0-63.ucode
+iwlwifi-QuQnj-b0-hr-b0-66.ucode
+iwlwifi-QuQnj-b0-hr-b0-72.ucode
+iwlwifi-QuQnj-b0-jf-b0-48.ucode
+iwlwifi-QuQnj-b0-jf-b0-50.ucode
+iwlwifi-QuQnj-b0-jf-b0-59.ucode
+iwlwifi-QuQnj-b0-jf-b0-63.ucode
+iwlwifi-QuQnj-b0-jf-b0-66.ucode
+iwlwifi-QuQnj-b0-jf-b0-72.ucode
 iwlwifi-QuQnj-f0-hr-a0-34.ucode
+iwlwifi-QuQnj-f0-hr-a0-43.ucode
+iwlwifi-QuQnj-f0-hr-a0-48.ucode
+iwlwifi-QuQnj-f0-hr-a0-50.ucode
+iwlwifi-SoSnj-a0-gf-a0-59.ucode
+iwlwifi-SoSnj-a0-gf-a0-63.ucode
+iwlwifi-SoSnj-a0-gf-a0-66.ucode
+iwlwifi-SoSnj-a0-gf-a0-72.ucode
+iwlwifi-SoSnj-a0-gf4-a0-59.ucode
+iwlwifi-SoSnj-a0-gf4-a0-63.ucode
+iwlwifi-SoSnj-a0-gf4-a0-66.ucode
+iwlwifi-SoSnj-a0-gf4-a0-72.ucode
+iwlwifi-SoSnj-a0-hr-b0-59.ucode
+iwlwifi-SoSnj-a0-hr-b0-63.ucode
+iwlwifi-SoSnj-a0-hr-b0-66.ucode
+iwlwifi-SoSnj-a0-hr-b0-72.ucode
+iwlwifi-SoSnj-a0-jf-b0-63.ucode
+iwlwifi-SoSnj-a0-jf-b0-66.ucode
+iwlwifi-SoSnj-a0-jf-b0-72.ucode
+iwlwifi-SoSnj-a0-mr-a0-59.ucode
+iwlwifi-SoSnj-a0-mr-a0-63.ucode
+iwlwifi-SoSnj-a0-mr-a0-66.ucode
+iwlwifi-SoSnj-a0-mr-a0-72.ucode
+iwlwifi-bz-a0-fm-a0-72.ucode
+iwlwifi-bz-a0-fm-b0-83.ucode
+iwlwifi-bz-a0-fm-b0-86.ucode
+iwlwifi-bz-a0-fm-c0-83.ucode
+iwlwifi-bz-a0-fm-c0-86.ucode
+iwlwifi-bz-a0-fm4-a0-72.ucode
+iwlwifi-bz-a0-fm4-b0-83.ucode
+iwlwifi-bz-a0-fm4-b0-86.ucode
+iwlwifi-bz-a0-gf-a0-63.ucode
+iwlwifi-bz-a0-gf-a0-66.ucode
+iwlwifi-bz-a0-gf-a0-72.ucode
+iwlwifi-bz-a0-gf-a0-83.ucode
+iwlwifi-bz-a0-gf-a0-86.ucode
+iwlwifi-bz-a0-gf4-a0-63.ucode
+iwlwifi-bz-a0-gf4-a0-66.ucode
+iwlwifi-bz-a0-gf4-a0-72.ucode
+iwlwifi-bz-a0-gf4-a0-83.ucode
+iwlwifi-bz-a0-gf4-a0-86.ucode
+iwlwifi-bz-a0-hr-b0-63.ucode
+iwlwifi-bz-a0-hr-b0-66.ucode
+iwlwifi-bz-a0-hr-b0-72.ucode
+iwlwifi-bz-a0-hr-b0-83.ucode
+iwlwifi-bz-a0-hr-b0-86.ucode
+iwlwifi-bz-a0-mr-a0-63.ucode
+iwlwifi-bz-a0-mr-a0-66.ucode
+iwlwifi-bz-a0-mr-a0-72.ucode
+iwlwifi-gl-a0-fm-a0-72.ucode
+iwlwifi-gl-b0-fm-b0-72.ucode
+iwlwifi-gl-b0-fm-b0-83.ucode
+iwlwifi-gl-b0-fm-b0-86.ucode
+iwlwifi-ma-a0-fm-a0-66.ucode
+iwlwifi-ma-a0-fm-a0-72.ucode
+iwlwifi-ma-a0-gf-a0-59.ucode
+iwlwifi-ma-a0-gf-a0-63.ucode
+iwlwifi-ma-a0-gf-a0-66.ucode
+iwlwifi-ma-a0-gf-a0-72.ucode
+iwlwifi-ma-a0-gf-a0-83.ucode
+iwlwifi-ma-a0-gf-a0-86.ucode
+iwlwifi-ma-a0-gf4-a0-63.ucode
+iwlwifi-ma-a0-gf4-a0-66.ucode
+iwlwifi-ma-a0-gf4-a0-72.ucode
+iwlwifi-ma-a0-gf4-a0-83.ucode
+iwlwifi-ma-a0-gf4-a0-86.ucode
+iwlwifi-ma-a0-hr-b0-63.ucode
+iwlwifi-ma-a0-hr-b0-66.ucode
+iwlwifi-ma-a0-hr-b0-72.ucode
+iwlwifi-ma-a0-hr-b0-83.ucode
+iwlwifi-ma-a0-hr-b0-86.ucode
+iwlwifi-ma-a0-mr-a0-59.ucode
+iwlwifi-ma-a0-mr-a0-63.ucode
+iwlwifi-ma-a0-mr-a0-66.ucode
+iwlwifi-ma-a0-mr-a0-72.ucode
+iwlwifi-ma-a0-mr-a0-83.ucode
+iwlwifi-ma-a0-mr-a0-86.ucode
+iwlwifi-ma-b0-mr-a0-83.ucode
+iwlwifi-ma-b0-mr-a0-86.ucode
+iwlwifi-sc-a0-fm-b0-83.ucode
+iwlwifi-sc-a0-fm-b0-86.ucode
+iwlwifi-sc-a0-fm-c0-83.ucode
+iwlwifi-sc-a0-fm-c0-86.ucode
+iwlwifi-sc-a0-gf-a0-83.ucode
+iwlwifi-sc-a0-gf-a0-86.ucode
+iwlwifi-sc-a0-gf4-a0-83.ucode
+iwlwifi-sc-a0-gf4-a0-86.ucode
+iwlwifi-sc-a0-hr-b0-83.ucode
+iwlwifi-sc-a0-hr-b0-86.ucode
+iwlwifi-sc-a0-wh-a0-83.ucode
+iwlwifi-sc-a0-wh-a0-86.ucode
+iwlwifi-sc2-a0-fm-c0-86.ucode
+iwlwifi-sc2-a0-wh-a0-86.ucode
+iwlwifi-sc2f-a0-fm-c0-86.ucode
+iwlwifi-sc2f-a0-wh-a0-86.ucode
+iwlwifi-so-a0-gf-a0-48.ucode
+iwlwifi-so-a0-gf-a0-50.ucode
+iwlwifi-so-a0-gf-a0-59.ucode
+iwlwifi-so-a0-gf-a0-63.ucode
+iwlwifi-so-a0-gf-a0-66.ucode
+iwlwifi-so-a0-hr-b0-48.ucode
+iwlwifi-so-a0-hr-b0-50.ucode
+iwlwifi-so-a0-hr-b0-59.ucode
+iwlwifi-so-a0-hr-b0-63.ucode
+iwlwifi-so-a0-hr-b0-66.ucode
+iwlwifi-so-a0-jf-b0-48.ucode
+iwlwifi-so-a0-jf-b0-50.ucode
+iwlwifi-so-a0-jf-b0-59.ucode
+iwlwifi-so-a0-jf-b0-63.ucode
+iwlwifi-so-a0-jf-b0-66.ucode
+iwlwifi-so-a0-jf-b0-83.ucode
+iwlwifi-so-a0-jf-b0-86.ucode
+iwlwifi-su-z0-43.ucode
+iwlwifi-ty-a0-gf-a0-48.ucode
+iwlwifi-ty-a0-gf-a0-50.ucode
 iwmc3200wifi-calib-sdio.bin
 iwmc3200wifi-lmac-sdio.bin
 iwmc3200wifi-umac-sdio.bin
 ks7010sd.rom
+lantiq/xrx200_phy11g_a14.bin
+lantiq/xrx200_phy11g_a22.bin
+lantiq/xrx200_phy22f_a14.bin
+lantiq/xrx200_phy22f_a22.bin
+lantiq/xrx300_phy11g_a21.bin
+lantiq/xrx300_phy22f_a21.bin
 lattice-ecp3.bit
 libertas/cf8305.bin
 libertas/gspi8385.bin
@@ -180,11 +427,25 @@ liquidio/lio_23xx.bin
 liquidio/lio_410nv.bin
 me2600_firmware.bin
 me4000_firmware.bin
+mediatek/mt7996/mt7992_dsp.bin
+mediatek/mt7996/mt7992_rom_patch.bin
+mediatek/mt7996/mt7992_wa.bin
+mediatek/mt7996/mt7992_wm.bin
+metronome.wbf
 mrvl/pcie8766_uapsta.bin
+mrvl/pcie8897_uapsta_a0.bin
 mrvl/pcie8997_uapsta.bin
 mrvl/sd8786_uapsta.bin
+mrvl/sd8977_uapsta.bin
+mrvl/sd8987_uapsta.bin
 mrvl/sd8997_uapsta.bin
+mrvl/sdiouart8997_combo_v4.bin
+mrvl/sdiouartiw416_combo_v0.bin
 mrvl/usb8997_uapsta.bin
+mt7603_e1.bin
+mt7603_e2.bin
+mt7628_e1.bin
+mt7628_e2.bin
 mwl8k/fmimage_8363.fw
 mwl8k/helper_8363.fw
 ni6534a.bin
@@ -196,11 +457,36 @@ nxromimg.bin
 orinoco_ezusb_fw
 pca200e_ecd.bin2
 phanfw-4.0.579.bin
+plfxlc/lifi-x.bin
 prism2_ru.fw
 prism_ap_fw.bin
 prism_sta_fw.bin
+qat_420xx.bin
+qat_420xx_mmp.bin
+ql2600_fw.bin
+ql2700_fw.bin
+ql8100_fw.bin
+ql8300_fw.bin
+ram.bin
+regulatory.db
+regulatory.db.p7s
+renesas_usb_fw.mem
+rtl_bt/rtl8723b_config.bin
+rtl_bt/rtl8723bs_config.bin
+rtl_bt/rtl8723cs_cg_config.bin
+rtl_bt/rtl8723cs_cg_fw.bin
+rtl_bt/rtl8723cs_vf_config.bin
+rtl_bt/rtl8723cs_vf_fw.bin
+rtl_bt/rtl8723cs_xx_config.bin
+rtl_bt/rtl8723cs_xx_fw.bin
+rtl_bt/rtl8723ds_config.bin
+rtl_bt/rtl8723ds_fw.bin
+rtl_bt/rtl8761a_config.bin
+rtl_bt/rtl8852bs_config.bin
+rtl_bt/rtl8852bs_fw.bin
 rtlwifi/rtl8723bu_bt.bin
 rtlwifi/rtl8723efw.bin
+s5k4ecgx.bin
 sd8686.bin
 sd8686_helper.bin
 softing-4.6/bcard.bin
@@ -222,54 +508,52 @@ usb8388.bin
 wd719x-risc.bin
 wd719x-wcs.bin
 wil6210_sparrow_plus.fw
+wil6436.brd
+wil6436.fw
 wlan/prima/WCNSS_qcom_wlan_nv.bin
+wlwifi-SoSnj-a0-mr-a0-59.ucode
 zd1201-ap.fw
 zd1201.fw
 )) {
-    $skip->{$fw} = 1;
+    $ALLOW_MISSING->{$fw} = 1;
 }
 
 sub copy_fw {
     my ($src, $dstfw) = @_;
 
     my $dest = "$target/$dstfw";
-
-    return if -f $dest;
+    return if -f $dest || -f "${dest}.xz";
 
     mkpath dirname($dest);
-    system ("cp '$src' '$dest'") == 0 || die "copy $src to $dest failed";
+    system ("cp '$src' '$dest'") == 0 or die "copy '$src' to '$dest' failed!\n";
 }
 
-my $fwdone = {};
+my ($fwdone, $fwbase_name, $error) = ({}, {}, 0);
 
-my $error = 0;
+sub add_fw :prototype($$) {
+    my ($fw, $mod) = @_;
 
-open(TMP, $fwlist);
-while(defined(my $line = <TMP>)) {
-    chomp $line;
-    my ($fw, $mod) = split(/\s+/, $line, 2);
+    return if $fw =~ m/\b(?:microcode_amd|amd_sev_)/; # contained in amd64-microcode
 
-    next if $mod =~ m|^kernel/sound|;
-    next if $mod =~ m|^kernel/drivers/isdn|;
+    my $fw_name = basename($fw);
+    $fwbase_name->{$fw_name} = 1;
 
-    # skip ZyDas usb wireless, use package zd1211-firmware instead
-    next if $fw =~ m|^zd1211/|; 
+    return if $mod =~ m|^kernel/sound|;
+    return if $mod =~ m|^kernel/drivers/isdn|;
 
-    # skip atmel at76c50x wireless networking chips.
-    # use package atmel-firmware instead
-    next if $fw =~ m|^atmel_at76c50|;
+    # skip ZyDas usb wireless, use package zd1211-firmware instead
+    return if $fw =~ m|^zd1211/|;
 
-    # skip Bluetooth dongles based on the Broadcom BCM203x 
-    # use package bluez-firmware instead
-    next if $fw =~ m|^BCM2033|;
+    # skip atmel at76c50x wireless networking chips, use package atmel-firmware instead
+    return if $fw =~ m|^atmel_at76c50|;
 
-    next if $fw =~ m|^xc3028-v27\.fw|; # found twice!
-    next if $fw =~ m|.inp|; # where are those files?
-    next if $fw =~ m|^ueagle-atm/|; # where are those files?
+    # skip Bluetooth dongles based on the Broadcom BCM203x, use package bluez-firmware instead
+    return if $fw =~ m|^BCM2033|;
 
-    next if $force_skip->{$fw};
+    return if $fw =~ m|^xc3028-v27\.fw|; # found twice!
+    return if $fw =~ m|^ueagle-atm/|; # where are those files?
 
-    next if $fwdone->{$fw};
+    return if $fwdone->{$fw};
     $fwdone->{$fw} = 1;
 
     my $fwdest = $fw;
@@ -283,38 +567,60 @@ while(defined(my $line = <TMP>)) {
     if ($fw eq 'PE520.cis') {
 	$fw = 'cis/PE520.cis';
     }
- 
-    # the rtl_nic/rtl8168d-1.fw file is buggy in current kernel tree
-    if (-f "$fwsrc0/$fw" && 
-	($fw ne 'rtl_nic/rtl8168d-1.fw')) { 
-	copy_fw("$fwsrc0/$fw", $fwdest);
-	next;
-    }
-    if (-f "$fwsrc1/$fw") {
-	copy_fw("$fwsrc1/$fw", $fwdest);
-	next;
+
+    if (-e "$target/$fw") {
+	warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
+	return;
     }
     if (-f "$fwsrc3/$fw") {
 	copy_fw("$fwsrc3/$fw", $fwdest);
-	next;
+	return;
+    }
+
+    my $module = basename($mod);
+    my $name = basename($fw);
+    my $fw_dir = dirname($fw);
+
+    if ($name =~ /\*/) {
+	die "cannot handle GLOBs in path stem ('$fw_dir'), switch find below to regex and transform GLOB to regex"
+	    if $fw_dir =~ /\*/;
+
+	my $sr = `find '$target/$fw_dir' \\( -type f -o -type l \\) -name '$name'`;
+	chomp $sr;
+	if ($sr) {
+	    for my $f (split("\n", $sr)) {
+		print "found $f for GLOB '$fw'\n";
+		my $f_name = basename($f);
+		$fwbase_name->{$f_name} = 1;
+	    }
+	    warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
+	    return;
+	} else {
+	    return if $ALLOW_MISSING->{$fw};
+	    warn "ERROR: unable to find FW for GLOB ($module): $fw\n";
+	    $error++;
+	}
     }
 
     if ($fw =~ m|/|) {
-	next if $skip->{$fw};
+	return if $ALLOW_MISSING->{$fw};
 
-	warn "unable to find firmware: $fw $mod\n";
+	warn "ERROR: unable to find firmware ($module): $fw\n";
 	$error++;
-	next;
+	return;
     }
 
-    my $name = basename($fw);
-
-    my $sr = `find '$fwsrc1' -type f -name '$name'`;
+    my $sr = `find '$target' \\( -type f -o -type l \\) -name '$name'`;
     chomp $sr;
     if ($sr) {
-	print "found $fw in $sr\n";
-	copy_fw($sr, $fwdest);
-	next;
+	my $found = 0;
+	for my $f (split("\n", $sr)) {
+	    if ($f =~ /$fw$/) {
+		print "found linked $fw in $f\n";
+		$found = 1;
+	    }
+	}
+	return if $found;
     }
 
     $sr = `find '$fwsrc2' -type f -name '$name'`;
@@ -322,7 +628,7 @@ while(defined(my $line = <TMP>)) {
     if ($sr) {
 	print "found $fw in $sr\n";
 	copy_fw($sr, $fwdest);
-	next;
+	return;
     }
 
     $sr = `find '$fwsrc3' -type f -name '$name'`;
@@ -330,16 +636,68 @@ while(defined(my $line = <TMP>)) {
     if ($sr) {
 	print "found $fw in $sr\n";
 	copy_fw($sr, $fwdest);
-	next;
+	return;
     }
 
-    next if $skip->{$fw};
-    next if $fw =~ m|^dvb-|;
+    return if $ALLOW_MISSING->{$fw};
+    return if $fw =~ m|^dvb-| || $fw =~ m|\.inp$|;
 
-    warn "unable to find firmware: $fw $mod\n";
+    warn "ERROR: unable to find firmware ($module): $fw\n";
     $error++;
-    next;
+    return;
+}
+
+open(my $fd, '<', $fwlist);
+while(defined(my $line = <$fd>)) {
+    chomp $line;
+    my ($fw, $mod) = split(/\s+/, $line, 2);
+
+    add_fw($fw, $mod);
 }
-close(TMP);
+close($fd);
+
+for my $fw ($FORCE_INCLUDE->@*) {
+    add_fw($fw, 'FORCE_INCLUDE');
+}
+
+exit($error) if $error;
+
+my $target_fw_string = `find '$target' -type f -o -type l`;
+chomp $target_fw_string;
+exit(-1) if !$target_fw_string;
+
+my $all_fw_files = [ split("\n", $target_fw_string) ];
+
+my ($keep, $delete) = (0, 0);
+
+my $link_target = {};
+for my $f (@$all_fw_files) {
+    next if ! -l $f;
+    my $link = basename($f);
+    my $file = readlink($f);
+    my $target = basename($file);
+    $link_target->{$target} = 1 if $fwbase_name->{$link};
+    $link_target->{$file} = 1 if $fwbase_name->{$link};
+}
+
+for my $f (@$all_fw_files) {
+    my $name = basename($f);
+
+    if ($fwbase_name->{$name}) {
+	$keep++;
+    } elsif ($link_target->{$name}) {
+	#print "skip link target '$f'\n";
+	$keep++;
+    } else {
+	print "delete unreferenced $f\n";
+	unlink $f or warn "ERROR deleting '$f' - $!\n";
+	$delete++;
+    }
+}
+
+print "cleanup end result: keep: $keep, delete: $delete\n";
+
+# just some random boundary to catch some stupid '*' GLOB errors, adapt as needed.
+die "delete number is awfully low ($delete < 100)\n" if $delete < 100;
 
-exit($error);
+exit(0);