Package: release.debian.org Thanks please unblock firmware-nonfree 20210208-4 it has minimal differences to 20210208-3: * fixes Raspberry Pi 4 Wifi firmware loading * 2 additional symlinks for config files * adds a missing mediatek firmware see attached source diff. As upstream just realeased 20210315, it is planed to upload that soonish to unstable to push it into testing. It adds to above newer iwlwifi + intel bluetooth + amd green sardine hardware support. thank you. -- maks
diff --git a/debian/changelog b/debian/changelog
index 6e42b05..5dfb071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+firmware-nonfree (20210208-4) unstable; urgency=medium
+
+ * List MediaTek mt8183 firmware.
+ * Update to linux-support 5.10.0-4.
+ * Add upstream fix for Raspberry Pi 4B. (closes: #984489)
+ * Support BananaPi M2 ultra and BananaPi M3. (closes: #982579)
+ Thanks to Ben Hutchings <ben@decadent.org.uk>,
+ Bernhard <bewoern1@gmail.com>
+
+ -- maximilian attems <maks@debian.org> Sat, 13 Mar 2021 13:23:22 +0100
+
firmware-nonfree (20210208-3) unstable; urgency=medium
* misc-nonfree: Add missing config files for cxgb4 (closes: #983561)
diff --git a/debian/config/brcm80211/defines b/debian/config/brcm80211/defines
index bbd9d88..ddba14d 100644
--- a/debian/config/brcm80211/defines
+++ b/debian/config/brcm80211/defines
@@ -21,6 +21,8 @@ files:
brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
+ brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
+ brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
brcm/brcmfmac4339-sdio.bin
brcm/brcmfmac43430-sdio.bin
brcm/brcmfmac43430-sdio.clm_blob
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index 3ae0477..96af121 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -176,6 +176,7 @@ files:
mediatek/mt7915_rom_patch.bin
mediatek/mt8173/vpu_d.bin
mediatek/mt8173/vpu_p.bin
+ mediatek/mt8183/scp.img
mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
mediatek/WIFI_RAM_CODE_MT7961_1.bin
moxa/moxa-1110.fw
diff --git a/debian/patches/0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch b/debian/patches/0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch
new file mode 100644
index 0000000..6630b50
--- /dev/null
+++ b/debian/patches/0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch
@@ -0,0 +1,31 @@
+From 58825f74eb0156822065c449a770644a69044d88 Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Tue, 16 Feb 2021 20:35:23 +0100
+Subject: [PATCH 1/6] brcm: Fix Raspberry Pi 4B NVRAM file
+
+NVRAM file set's boarflags3 to 0x48200100 which indicates the firmware
+that an external LPO is present. But on the RPi4 no external LPO exists.
+
+Fixes: 870b805 ("brcm: Update Raspberry Pi 3B+/4B NVRAM for downstream changes")
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+Signed-off-by: Josh Boyer <jwboyer@kernel.org>
+---
+ brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt b/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+index d5bd530..8dda168 100644
+--- a/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
++++ b/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+@@ -7,7 +7,7 @@ aa5g=1
+ AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+ boardflags=0x00480201
+ boardflags2=0x40800000
+-boardflags3=0x48200100
++boardflags3=0x44200100
+ boardrev=0x1304
+ boardtype=0x6e4
+ btc_mode=1
+--
+2.30.1
+
diff --git a/debian/patches/0002-Add-symlink-for-BananaPi-M2-to-brcmfmac43430-sdio-co.patch b/debian/patches/0002-Add-symlink-for-BananaPi-M2-to-brcmfmac43430-sdio-co.patch
new file mode 100644
index 0000000..ffc9f28
--- /dev/null
+++ b/debian/patches/0002-Add-symlink-for-BananaPi-M2-to-brcmfmac43430-sdio-co.patch
@@ -0,0 +1,34 @@
+From aa6c6e75b44b90bf9e46f3ebed95e25b0ceda8ec Mon Sep 17 00:00:00 2001
+From: maximilian attems <maks@stro.at>
+Date: Tue, 16 Feb 2021 19:44:21 +0100
+Subject: [PATCH 2/6] Add symlink for BananaPi M2 to brcmfmac43430-sdio config
+
+Fixes ( Debian bug #982579 [1]):
+ [ 10.514530] brcmfmac mmc2:0001:1: firmware: direct-loading firmware brcm/brcmfmac43430-sdio.bin
+ [ 10.514732] brcmfmac mmc2:0001:1: firmware: failed to load brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt ( -2)
+
+Refs:
+[1] https://bugs.debian.org/982579
+
+Reported-by: Bernhard <bewoern1@gmail.com>
+Signed-off-by: maximilian attems <maks@stro.at>
+Signed-off-by: Josh Boyer <jwboyer@kernel.org>
+---
+ WHENCE | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/WHENCE b/WHENCE
+index aa96404..11c0970 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -2716,6 +2716,7 @@ File: "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+ File: "brcm/brcmfmac43430-sdio.AP6212.txt"
+ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt -> brcmfmac43430-sdio.AP6212.txt
+ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt -> brcmfmac43430-sdio.AP6212.txt
++Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt -> brcmfmac43430-sdio.AP6212.txt
+ File: "brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt"
+ File: "brcm/brcmfmac43430-sdio.MUR1DX.txt"
+ File: "brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt"
+--
+2.30.1
+
diff --git a/debian/patches/0003-WHENCE-add-missing-symlink-for-BananaPi-M3.patch b/debian/patches/0003-WHENCE-add-missing-symlink-for-BananaPi-M3.patch
new file mode 100644
index 0000000..28c8d73
--- /dev/null
+++ b/debian/patches/0003-WHENCE-add-missing-symlink-for-BananaPi-M3.patch
@@ -0,0 +1,37 @@
+From 048a7cbca7a95799a6af0bcd85874c55b201118d Mon Sep 17 00:00:00 2001
+From: maximilian attems <maks@stro.at>
+Date: Mon, 22 Feb 2021 22:24:06 +0100
+Subject: [PATCH 3/6] WHENCE: add missing symlink for BananaPi M3
+
+Fixes (Debian bug #982579):
+> [ 11.957171] brcmfmac mmc2:0001:1: firmware: failed to load
+brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt (-2)
+> [ 11.967106] firmware_class: See https://wiki.debian.org/Firmware for
+information about missing firmware
+> [ 11.977035] brcmfmac mmc2:0001:1: firmware: failed to load
+brcm/brcmfmac43430-sdio.txt (-2)
+> [ 12.994756] brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): clkctl
+0x50
+
+Reported-by: Bernhard <bewoern1@gmail.com>
+Signed-off-by: maximilian attems <maks@stro.at>
+Signed-off-by: Josh Boyer <jwboyer@kernel.org>
+---
+ WHENCE | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/WHENCE b/WHENCE
+index 11c0970..b569990 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -2717,6 +2717,7 @@ File: "brcm/brcmfmac43430-sdio.AP6212.txt"
+ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt -> brcmfmac43430-sdio.AP6212.txt
+ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt -> brcmfmac43430-sdio.AP6212.txt
+ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt -> brcmfmac43430-sdio.AP6212.txt
++Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt -> brcmfmac43430-sdio.AP6212.txt
+ File: "brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt"
+ File: "brcm/brcmfmac43430-sdio.MUR1DX.txt"
+ File: "brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt"
+--
+2.30.1
+
diff --git a/debian/patches/series b/debian/patches/series
index cb80508..3de911d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
gitignore.patch
+0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch
+0002-Add-symlink-for-BananaPi-M2-to-brcmfmac43430-sdio-co.patch
+0003-WHENCE-add-missing-symlink-for-BananaPi-M3.patch
diff --git a/debian/rules.defs b/debian/rules.defs
index 8ee1b50..fa32bf4 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1 +1 @@
-KERNELVERSION := 5.10.0-3
+KERNELVERSION := 5.10.0-4
Attachment:
signature.asc
Description: PGP signature