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

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index 6711d59..3743f13 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -15,76 +15,46 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
 my $target = shift;
 die "no target directory" if !$target || ! -d $target;
 
-my $skip = {};
+my $FORCE_INCLUDE = [
+    'iwlwifi-*.pnvm',
+];
+
+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
-amdgpu/arcturus_asd.bin
-amdgpu/arcturus_gpu_info.bin
-amdgpu/arcturus_mec.bin
-amdgpu/arcturus_mec2.bin
-amdgpu/arcturus_rlc.bin
-amdgpu/arcturus_sdma.bin
-amdgpu/arcturus_smc.bin
-amdgpu/arcturus_sos.bin
-amdgpu/arcturus_ta.bin
-amdgpu/arcturus_vcn.bin
-amdgpu/dimgrey_cavefish_ce.bin
-amdgpu/dimgrey_cavefish_dmcub.bin
-amdgpu/dimgrey_cavefish_me.bin
-amdgpu/dimgrey_cavefish_mec.bin
-amdgpu/dimgrey_cavefish_mec2.bin
-amdgpu/dimgrey_cavefish_pfp.bin
-amdgpu/dimgrey_cavefish_rlc.bin
-amdgpu/dimgrey_cavefish_sdma.bin
-amdgpu/dimgrey_cavefish_smc.bin
-amdgpu/dimgrey_cavefish_sos.bin
-amdgpu/dimgrey_cavefish_ta.bin
-amdgpu/dimgrey_cavefish_vcn.bin
-amdgpu/green_sardine_asd.bin
-amdgpu/green_sardine_ce.bin
-amdgpu/green_sardine_dmcub.bin
-amdgpu/green_sardine_gpu_info.bin
-amdgpu/green_sardine_me.bin
-amdgpu/green_sardine_mec.bin
-amdgpu/green_sardine_mec2.bin
-amdgpu/green_sardine_pfp.bin
-amdgpu/green_sardine_rlc.bin
-amdgpu/green_sardine_sdma.bin
-amdgpu/green_sardine_ta.bin
-amdgpu/green_sardine_vcn.bin
+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/gc_11_0_0_toc.bin
+amdgpu/gc_11_0_3_mes.bin
+amdgpu/ip_discovery.bin
 amdgpu/navi10_mes.bin
-amdgpu/navy_flounder_ce.bin
-amdgpu/navy_flounder_dmcub.bin
-amdgpu/navy_flounder_me.bin
-amdgpu/navy_flounder_mec.bin
-amdgpu/navy_flounder_mec2.bin
-amdgpu/navy_flounder_pfp.bin
-amdgpu/navy_flounder_rlc.bin
-amdgpu/navy_flounder_sdma.bin
-amdgpu/navy_flounder_smc.bin
-amdgpu/navy_flounder_sos.bin
-amdgpu/navy_flounder_ta.bin
-amdgpu/navy_flounder_vcn.bin
+amdgpu/navi12_cap.bin
+amdgpu/sienna_cichlid_cap.bin
 amdgpu/sienna_cichlid_mes.bin
-amdgpu/vangogh_asd.bin
-amdgpu/vangogh_ce.bin
-amdgpu/vangogh_dmcub.bin
+amdgpu/sienna_cichlid_mes1.bin
+amdgpu/smu_14_0_2.bin
 amdgpu/vangogh_gpu_info.bin
-amdgpu/vangogh_me.bin
-amdgpu/vangogh_mec.bin
-amdgpu/vangogh_mec2.bin
-amdgpu/vangogh_pfp.bin
-amdgpu/vangogh_rlc.bin
-amdgpu/vangogh_sdma.bin
-amdgpu/vangogh_toc.bin
-amdgpu/vangogh_vcn.bin
+amdgpu/vega10_cap.bin
+amdgpu/yellow_carp_gpu_info.bin
 ar9170.fw
 ast_dp501_fw.bin
 ath10k/QCA6174/hw2.1/firmware-4.bin
@@ -104,6 +74,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
@@ -124,8 +95,16 @@ b43/ucode9.fw
 b43legacy/ucode2.fw
 b43legacy/ucode4.fw
 bfubase.frm
-brcm/brcm/brcmfmac*-pcie.*.txt
-brcm/brcm/brcmfmac*-sdio.*.txt
+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
@@ -140,24 +119,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
@@ -171,12 +173,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
@@ -215,6 +237,12 @@ 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
@@ -238,28 +266,127 @@ 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
@@ -287,12 +414,20 @@ 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
@@ -309,23 +444,33 @@ 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_4xxx.bin
-qat_4xxx_mmp.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
-wlwifi-SoSnj-a0-mr-a0-59.ucode
+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/rtl8821a_config.bin
+rtl_bt/rtl8852bs_config.bin
+rtl_bt/rtl8852bs_fw.bin
 rtlwifi/rtl8723bu_bt.bin
 rtlwifi/rtl8723efw.bin
 s5k4ecgx.bin
@@ -353,55 +498,49 @@ 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 or die "copy '$src' to '$dest' failed!\n";
 }
 
-my $fwdone = {};
-my $fwbase_name = {};
+my ($fwdone, $fwbase_name, $error) = ({}, {}, 0);
 
-my $error = 0;
+sub add_fw :prototype($$) {
+    my ($fw, $mod) = @_;
 
-open(my $fd, '<', $fwlist);
-while(defined(my $line = <$fd>)) {
-    chomp $line;
-    my ($fw, $mod) = split(/\s+/, $line, 2);
+    return if $fw =~ m/\b(?:microcode_amd|amd_sev_)/; # contained in amd64-microcode
 
     my $fw_name = basename($fw);
     $fwbase_name->{$fw_name} = 1;
 
-    next if $mod =~ m|^kernel/sound|;
-    next if $mod =~ m|^kernel/drivers/isdn|;
+    return if $mod =~ m|^kernel/sound|;
+    return if $mod =~ m|^kernel/drivers/isdn|;
 
     # skip ZyDas usb wireless, use package zd1211-firmware instead
-    next if $fw =~ m|^zd1211/|; 
+    return if $fw =~ m|^zd1211/|;
 
-    # skip atmel at76c50x wireless networking chips.
-    # use package atmel-firmware instead
-    next if $fw =~ m|^atmel_at76c50|;
+    # skip atmel at76c50x wireless networking chips, use package atmel-firmware instead
+    return if $fw =~ m|^atmel_at76c50|;
 
-    # skip Bluetooth dongles based on the Broadcom BCM203x 
-    # use package bluez-firmware instead
-    next if $fw =~ m|^BCM2033|;
+    # skip Bluetooth dongles based on the Broadcom BCM203x, use package bluez-firmware instead
+    return if $fw =~ m|^BCM2033|;
 
-    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?
+    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;
@@ -415,38 +554,60 @@ while(defined(my $line = <$fd>)) {
     if ($fw eq 'PE520.cis') {
 	$fw = 'cis/PE520.cis';
     }
- 
+
     if (-e "$target/$fw") {
-	warn "WARN: allowed to skip existing '$fw'\n" if $skip->{$fw};
-	next;
+	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 "ERROR: unable to find firmware ($module): $fw\n";
 	$error++;
-	next;
+	return;
     }
 
-    my $name = basename($fw);
-
     my $sr = `find '$target' \\( -type f -o -type l \\) -name '$name'`;
     chomp $sr;
     if ($sr) {
 	my $found = 0;
 	for my $f (split("\n", $sr)) {
 	    if ($f =~ /$fw$/) {
-		print "found $fw in $f\n";
+		print "found linked $fw in $f\n";
 		$found = 1;
 	    }
 	}
-	next if $found;
+	return if $found;
     }
 
     $sr = `find '$fwsrc2' -type f -name '$name'`;
@@ -454,7 +615,7 @@ while(defined(my $line = <$fd>)) {
     if ($sr) {
 	print "found $fw in $sr\n";
 	copy_fw($sr, $fwdest);
-	next;
+	return;
     }
 
     $sr = `find '$fwsrc3' -type f -name '$name'`;
@@ -462,18 +623,30 @@ while(defined(my $line = <$fd>)) {
     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 "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($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`;
@@ -511,4 +684,7 @@ for my $f (@$all_fw_files) {
 
 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(0);