Merging debian version 20230625-3~exp2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 59 insertions, 49 deletions

diff --git a/debian/firmware-brcm80211.metainfo.xml b/debian/firmware-brcm80211.metainfo.xml
index 89c6f18..bae5dcc 100644
--- a/debian/firmware-brcm80211.metainfo.xml
+++ b/debian/firmware-brcm80211.metainfo.xml
@@ -7,43 +7,74 @@
   <provides>
     <firmware type="runtime">brcm/bcm43xx-0.fw</firmware>
     <firmware type="runtime">brcm/bcm43xx_hdr-0.fw</firmware>
-    <firmware type="runtime">brcm/brcmfmac43012-sdio.clm_blob</firmware>
+    <firmware type="runtime">brcm/brcmfmac4329-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4330-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4330-sdio.Prowise-PT301.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4334-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4335-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4339-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4350-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4350c2-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4354-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4354-sdio.clm_blob</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-pcie.clm_blob</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-pcie.gpd-win-pocket.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.AP6356S.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.clm_blob</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.khadas,vim2.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4356-sdio.vamrs,rock960.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac4358-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4366b-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4366c-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4371-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4373.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4373-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac4373-sdio.clm_blob</firmware>
     <firmware type="runtime">brcm/brcmfmac43012-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac43012-sdio.clm_blob</firmware>
     <firmware type="runtime">brcm/brcmfmac43143.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43143-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43236b.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43241b0-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43241b4-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43241b5-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43242a.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4329-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4330-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4330-sdio.Prowise-PT301.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43340-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43340-sdio.meegopad-t08.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43340-sdio.predia-basic.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4334-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4335-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac43340-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43362-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43362-sdio.kobo,aura.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43362-sdio.kobo,tolino-shine2hd.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43362-sdio.lemaker,bananapro.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.ilife-S806.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4339-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac43362-sdio.WC121.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.AP6212.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.clm_blob</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac43430-sdio.AP6212.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.MUR1DX.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.ilife-S806.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43455-sdio.acepc-t8.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.AW-CM256SM.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.clm_blob</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt</firmware>
@@ -54,59 +85,38 @@
     <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.0.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.1.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,soquartz-model-a.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,soquartz-cm4io.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,soquartz-blade.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,soquartz-cm4io.txt</firmware>
+    <firmware type="runtime">brcm/brcmfmac43455-sdio.pine64,soquartz-model-a.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt</firmware>
     <firmware type="runtime">brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4350c2-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4350-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4354-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4354-sdio.clm_blob</firmware>
     <firmware type="runtime">brcm/brcmfmac43569.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-pcie.gpd-win-pocket.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-pcie.clm_blob</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.clm_blob</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.AP6356S.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.khadas,vim2.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4356-sdio.vamrs,rock960.txt</firmware>
-    <firmware type="runtime">brcm/brcmfmac4358-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac43602-pcie.ap.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43602-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4366b-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4366c-pcie.bin</firmware>
+    <firmware type="runtime">brcm/brcmfmac43602-pcie.ap.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43570-pcie.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac43570-pcie.clm_blob</firmware>
-    <firmware type="runtime">brcm/brcmfmac4371-pcie.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4373.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4373-sdio.bin</firmware>
-    <firmware type="runtime">brcm/brcmfmac4373-sdio.clm_blob</firmware>
     <firmware type="runtime">brcm/brcmfmac54591-pcie.bin</firmware>
     <firmware type="runtime">brcm/brcmfmac54591-pcie.clm_blob</firmware>
+    <firmware type="runtime">cypress/cyfmac4339-sdio.bin</firmware>
+    <firmware type="runtime">cypress/cyfmac4354-sdio.bin</firmware>
+    <firmware type="runtime">cypress/cyfmac4354-sdio.clm_blob</firmware>
+    <firmware type="runtime">cypress/cyfmac4356-pcie.bin</firmware>
+    <firmware type="runtime">cypress/cyfmac4356-pcie.clm_blob</firmware>
+    <firmware type="runtime">cypress/cyfmac4356-sdio.bin</firmware>
+    <firmware type="runtime">cypress/cyfmac4356-sdio.clm_blob</firmware>
+    <firmware type="runtime">cypress/cyfmac4373-sdio.bin</firmware>
+    <firmware type="runtime">cypress/cyfmac4373-sdio.clm_blob</firmware>
     <firmware type="runtime">cypress/cyfmac43012-sdio.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43012-sdio.clm_blob</firmware>
     <firmware type="runtime">cypress/cyfmac43340-sdio.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43362-sdio.bin</firmware>
-    <firmware type="runtime">cypress/cyfmac4339-sdio.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43430-sdio.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43430-sdio.clm_blob</firmware>
     <firmware type="runtime">cypress/cyfmac43455-sdio.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43455-sdio.clm_blob</firmware>
-    <firmware type="runtime">cypress/cyfmac4354-sdio.bin</firmware>
-    <firmware type="runtime">cypress/cyfmac4354-sdio.clm_blob</firmware>
-    <firmware type="runtime">cypress/cyfmac4356-pcie.bin</firmware>
-    <firmware type="runtime">cypress/cyfmac4356-pcie.clm_blob</firmware>
-    <firmware type="runtime">cypress/cyfmac4356-sdio.bin</firmware>
-    <firmware type="runtime">cypress/cyfmac4356-sdio.clm_blob</firmware>
     <firmware type="runtime">cypress/cyfmac43570-pcie.bin</firmware>
     <firmware type="runtime">cypress/cyfmac43570-pcie.clm_blob</firmware>
-    <firmware type="runtime">cypress/cyfmac4373-sdio.bin</firmware>
-    <firmware type="runtime">cypress/cyfmac4373-sdio.clm_blob</firmware>
     <firmware type="runtime">cypress/cyfmac54591-pcie.bin</firmware>
     <firmware type="runtime">cypress/cyfmac54591-pcie.clm_blob</firmware>
     <modalias>bcma:m04BFid0812rev11cl*</modalias>