1:20210315-3+rpt5 release

Add ability to choose between 43436 and 43436S using update-alternatives

debian/.gitignore

@@ -10,3 +10,5 @@
 /rules.gen
 /stamps/
 !/*.lintian-overrides
+!/firmware-brcm80211.postinst
+!/firmware-brcm80211.prerm

debian/changelog

@@ -1,3 +1,9 @@
+firmware-nonfree (1:20210315-3+rpt5) bullseye; urgency=medium
+
+  * Add ability to choose between 43436 and 43436S using update-alternatives
+
+ -- Serge Schneider <serge@raspberrypi.com>  Fri, 14 Jan 2022 20:35:31 +0000
+
 firmware-nonfree (1:20210315-3+rpt4) bullseye; urgency=medium
 
   [ Phil Elwell ]

debian/config/brcm80211/defines

@@ -38,9 +38,9 @@ files:
  brcm/brcmfmac43430-sdio.MUR1DX.txt
  brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
  brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
- brcm/brcmfmac43436-sdio.bin
+ brcm/brcmfmac43436f-sdio.bin
  brcm/brcmfmac43436-sdio.clm_blob
- brcm/brcmfmac43436-sdio.txt
+ brcm/brcmfmac43436f-sdio.txt
  brcm/brcmfmac43436s-sdio.bin
  brcm/brcmfmac43436s-sdio.txt
  brcm/brcmfmac43455-sdio.bin
@@ -160,14 +160,14 @@ desc: Broadcom BCM43430 Murata 1DX NVRAM
 [brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt_base]
 desc: Jumper EZpad mini 3 tablet AP6210 Wifi/BT NVRAM
 
-[brcm/brcmfmac43436-sdio.bin_base]
+[brcm/brcmfmac43436f-sdio.bin_base]
 desc: Broadcom BCM43436 firmware
 version: 9.88.4.65
 
 [brcm/brcmfmac43436-sdio.clm_blob]
 desc: Broadcom BCM43436 localisations blob
 
-[brcm/brcmfmac43436-sdio.txt_base]
+[brcm/brcmfmac43436f-sdio.txt_base]
 desc: NVRAM file for BCM43436
 
 [brcm/brcmfmac43456s-sdio.bin_base]

debian/firmware-brcm80211.postinst

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+	update-alternatives --quiet --install \
+	                    /lib/firmware/brcm/brcmfmac43436-sdio.bin brcmfmac43436-sdio.bin /lib/firmware/brcm/brcmfmac43436f-sdio.bin 50 \
+			    --slave /lib/firmware/brcm/brcmfmac43436-sdio.txt brcmfmac43436-sdio.txt /lib/firmware/brcm/brcmfmac43436f-sdio.txt
+	update-alternatives --quiet --install \
+	                    /lib/firmware/brcm/brcmfmac43436-sdio.bin brcmfmac43436-sdio.bin /lib/firmware/brcm/brcmfmac43436s-sdio.bin 10 \
+			    --slave /lib/firmware/brcm/brcmfmac43436-sdio.txt brcmfmac43436-sdio.txt /lib/firmware/brcm/brcmfmac43436s-sdio.txt
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/firmware-brcm80211.prerm

@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        update-alternatives --quiet --remove \
+                            brcmfmac43436-sdio.bin \
+                            /lib/firmware/brcm/brcmfmac43436s-sdio.bin
+        update-alternatives --quiet --remove \
+                            brcmfmac43436-sdio.bin \
+                            /lib/firmware/brcm/brcmfmac43436f-sdio.bin
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/rules

@@ -83,7 +83,7 @@ maintainerclean:
 	-rm debian/*.hook.*
 	rm -f debian/*.metainfo.xml
 	-rm debian/*.preinst
-	-rm debian/*.postinst
+	-find debian/ -type f -name '*.postinst' ! -name 'firmware-brcm80211.postinst'
 	-rm debian/*.templates
 
 .PHONY: clean build-indep build-arch build binary-indep binary-arch binary

debian/source/include-binaries

@@ -1,7 +1,7 @@
 debian/config/atheros/ath10k/QCA9377/hw1.0/firmware-5.bin
 debian/config/brcm80211/brcm/brcmfmac43430-sdio.bin
 debian/config/brcm80211/brcm/brcmfmac43430-sdio.clm_blob
-debian/config/brcm80211/brcm/brcmfmac43436-sdio.bin
+debian/config/brcm80211/brcm/brcmfmac43436f-sdio.bin
 debian/config/brcm80211/brcm/brcmfmac43436-sdio.clm_blob
 debian/config/brcm80211/brcm/brcmfmac43436s-sdio.bin
 debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin