bump version to 3.5-2

[pve-firmware.git] / assemble-firmware.pl

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index e200c4b09d6654caf7e2afea37f8340f57813994..07ec09fed4f312e7d3989923a3f4959aa3761c88 100755 (executable)
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -15,7 +15,7 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
 my $target = shift;
 die "no target directory" if !$target || ! -d $target;
 
-my $skip = {};
+my $ALLOW_MISSING = {};
 # debian squeeze also misses those files
 foreach my $fw (qw(
 3826.arm
@@ -25,18 +25,18 @@ FW13
 RTL8192U/boot.img
 RTL8192U/data.img
 RTL8192U/main.img
-amd/amd_sev_fam19h_model0xh.sbin
-amdgpu/aldebaran_mec.bin
-amdgpu/aldebaran_mec2.bin
-amdgpu/aldebaran_rlc.bin
-amdgpu/aldebaran_sdma.bin
-amdgpu/aldebaran_smc.bin
-amdgpu/aldebaran_sos.bin
-amdgpu/aldebaran_ta.bin
-amdgpu/aldebaran_vcn.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/navi10_mes.bin
 amdgpu/sienna_cichlid_mes.bin
 amdgpu/vangogh_gpu_info.bin
+amdgpu/yellow_carp_gpu_info.bin
 ar9170.fw
 ast_dp501_fw.bin
 ath10k/QCA6174/hw2.1/firmware-4.bin
@@ -56,6 +56,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
@@ -78,7 +79,10 @@ b43legacy/ucode4.fw
 bfubase.frm
 brcm/brcm/brcmfmac*-pcie.*.txt
 brcm/brcm/brcmfmac*-sdio.*.txt
+brcm/brcmfmac*-pcie.*.bin
 brcm/brcmfmac*-pcie.*.txt
+brcm/brcmfmac*-pcie.txt
+brcm/brcmfmac*-sdio.*.bin
 brcm/brcmfmac*-sdio.*.txt
 brcm/brcmfmac-sdio.bin
 brcm/brcmfmac-sdio.txt
@@ -94,6 +98,7 @@ brcm/brcmfmac4335-sdio.txt
 brcm/brcmfmac43362-sdio.txt
 brcm/brcmfmac4339-sdio.txt
 brcm/brcmfmac43430-sdio.txt
+brcm/brcmfmac43430b0-sdio.bin
 brcm/brcmfmac43455-sdio.txt
 brcm/brcmfmac43456-sdio.bin
 brcm/brcmfmac4350-pcie.txt
@@ -112,6 +117,8 @@ 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
 c218tunx.cod
 c320tunx.cod
 cbfw-3.0.3.1.bin
@@ -130,6 +137,8 @@ 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
 isi4608.bin
 isi4616.bin
@@ -193,45 +202,64 @@ 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-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-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-gf4-a0-59.ucode
 iwlwifi-SoSnj-a0-gf4-a0-63.ucode
+iwlwifi-SoSnj-a0-gf4-a0-66.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-jf-b0-63.ucode
+iwlwifi-SoSnj-a0-jf-b0-66.ucode
 iwlwifi-SoSnj-a0-mr-a0-59.ucode
 iwlwifi-SoSnj-a0-mr-a0-63.ucode
+iwlwifi-SoSnj-a0-mr-a0-66.ucode
 iwlwifi-bz-a0-gf-a0-63.ucode
+iwlwifi-bz-a0-gf-a0-66.ucode
 iwlwifi-bz-a0-gf4-a0-63.ucode
+iwlwifi-bz-a0-gf4-a0-66.ucode
 iwlwifi-bz-a0-hr-b0-63.ucode
+iwlwifi-bz-a0-hr-b0-66.ucode
 iwlwifi-bz-a0-mr-a0-63.ucode
+iwlwifi-bz-a0-mr-a0-66.ucode
+iwlwifi-ma-a0-fm-a0-66.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-gf4-a0-63.ucode
+iwlwifi-ma-a0-gf4-a0-66.ucode
 iwlwifi-ma-a0-hr-b0-63.ucode
+iwlwifi-ma-a0-hr-b0-66.ucode
 iwlwifi-ma-a0-mr-a0-59.ucode
 iwlwifi-ma-a0-mr-a0-63.ucode
+iwlwifi-ma-a0-mr-a0-66.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-su-z0-43.ucode
 iwlwifi-ty-a0-gf-a0-48.ucode
 iwlwifi-ty-a0-gf-a0-50.ucode
@@ -290,14 +318,14 @@ ql2600_fw.bin
 ql2700_fw.bin
 ql8100_fw.bin
 ql8300_fw.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/rtl8723ds_config.bin
 rtl_bt/rtl8723ds_fw.bin
 rtl_bt/rtl8761a_config.bin
-rtl_bt/rtl8821a_config.bin
 rtlwifi/rtl8723bu_bt.bin
 rtlwifi/rtl8723efw.bin
 s5k4ecgx.bin
@@ -325,10 +353,11 @@ 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 {
@@ -352,6 +381,8 @@ while(defined(my $line = <$fd>)) {
     chomp $line;
     my ($fw, $mod) = split(/\s+/, $line, 2);
 
+    next if $fw =~ m/\b(?:microcode_amd|amd_sev_)/; # contained in amd64-microcode
+
     my $fw_name = basename($fw);
     $fwbase_name->{$fw_name} = 1;
 
@@ -359,18 +390,15 @@ while(defined(my $line = <$fd>)) {
     next if $mod =~ m|^kernel/drivers/isdn|;
 
     # skip ZyDas usb wireless, use package zd1211-firmware instead
-    next if $fw =~ m|^zd1211/|; 
+    next if $fw =~ m|^zd1211/|;
 
-    # skip atmel at76c50x wireless networking chips.
-    # use package atmel-firmware instead
+    # skip atmel at76c50x wireless networking chips, use package atmel-firmware instead
     next if $fw =~ m|^atmel_at76c50|;
 
-    # skip Bluetooth dongles based on the Broadcom BCM203x 
-    # use package bluez-firmware instead
+    # skip Bluetooth dongles based on the Broadcom BCM203x, use package bluez-firmware instead
     next 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?
 
     next if $fwdone->{$fw};
@@ -387,9 +415,9 @@ 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};
+       warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
        next;
     }
     if (-f "$fwsrc3/$fw") {
@@ -398,23 +426,41 @@ while(defined(my $line = <$fd>)) {
     }
 
     my $module = basename($mod);
+    my $name = basename($fw);
+
+    if ($name =~ /\*/) {
+       my $sr = `find '$target' \\( -type f -o -type l \\) -name '$name'`;
+       chomp $sr;
+       if ($sr) {
+           for my $f (split("\n", $sr)) {
+               print "found $f for GLOB '$name'\n";
+               my $f_name = basename($f);
+               $fwbase_name->{$f_name} = 1;
+           }
+           warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
+           next;
+       } else {
+           next if $ALLOW_MISSING->{$fw};
+           warn "ERROR: unable to find FW for GLOB ($module): $fw\n";
+           $error++;
+       }
+    }
+
     if ($fw =~ m|/|) {
-       next if $skip->{$fw};
+       next if $ALLOW_MISSING->{$fw};
 
        warn "ERROR: unable to find firmware ($module): $fw\n";
        $error++;
        next;
     }
 
-    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;
            }
        }
@@ -437,8 +483,8 @@ while(defined(my $line = <$fd>)) {
        next;
     }
 
-    next if $skip->{$fw};
-    next if $fw =~ m|^dvb-|;
+    next if $ALLOW_MISSING->{$fw};
+    next if $fw =~ m|^dvb-| || $fw =~ m|\.inp$|;
 
     warn "ERROR: unable to find firmware ($module): $fw\n";
     $error++;