Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/bluez/broadcom/BCM4345C0.hcd and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/bluez/broadcom/BCM4345C0.hcd differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup4cd.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup4cd.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup4.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup4.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup4db.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup4db.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup4x.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup4x.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup_cd.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup_cd.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup_db.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup_db.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/fixup_x.dat and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/fixup_x.dat differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start4cd.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start4cd.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start4db.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start4db.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start4.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start4.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start4x.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start4x.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start_cd.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start_cd.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start_db.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start_db.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start.elf differ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/boot/start_x.elf and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/boot/start_x.elf differ diff -Nru linux-firmware-raspi2-3/debian/changelog linux-firmware-raspi2-4/debian/changelog --- linux-firmware-raspi2-3/debian/changelog 2021-01-21 16:21:28.000000000 +0000 +++ linux-firmware-raspi2-4/debian/changelog 2021-04-23 21:05:55.000000000 +0000 @@ -1,3 +1,26 @@ +linux-firmware-raspi2 (4-0ubuntu0~20.04.1) focal; urgency=medium + + * Backport to focal (LP: #1925971) + - Add aliases and diversions for brcmfmac43455 configuration on the + Raspberry Pi Compute Module 4, and 400 (LP: #1912905) + + - Added diversions for all wifi firmware blobs (LP: #1918013) + - New upstream boot firmware release, 1.20210303 + - New upstream bluetooth firmware release, 1.2-4+rpt8 + + [ Phil Elwell ] + - Second Spectra fix for CYW43455 (CVE-2020-10370) + - Original firmware name: BCM4345C0_003.001.025.0174.0342.hcd + + - New upstream wifi firmware release, 1:20190114-1+rpt11 + + [ Serge Schneider ] + - Update CYW43455 firmware + - brcm/brcmfmac43455-sdio.bin 7.45.229 + - See: https://github.com/raspberrypi/linux/issues/3849 + + -- William 'jawn-smith' Wilson Fri, 23 Apr 2021 16:05:55 -0500 + linux-firmware-raspi2 (3-0ubuntu2~20.04.1) focal; urgency=medium * Backport to focal (LP: #1911687) diff -Nru linux-firmware-raspi2-3/debian/linux-firmware-raspi2.postrm linux-firmware-raspi2-4/debian/linux-firmware-raspi2.postrm --- linux-firmware-raspi2-3/debian/linux-firmware-raspi2.postrm 2020-10-07 11:23:36.000000000 +0000 +++ linux-firmware-raspi2-4/debian/linux-firmware-raspi2.postrm 2021-04-23 21:05:55.000000000 +0000 @@ -2,33 +2,78 @@ set -e -remove_diversion_43430() { +remove_diversion_1() { + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.bin + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +} + +remove_diversion_2() { dpkg-divert --package linux-firmware-raspi2 --rename --remove \ /lib/firmware/brcm/brcmfmac43430-sdio.bin dpkg-divert --package linux-firmware-raspi2 --rename --remove \ /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt } -remove_diversion_43455() { +remove_diversion_3() { dpkg-divert --package linux-firmware-raspi2 --rename --remove \ - /lib/firmware/brcm/brcmfmac43455-sdio.bin + /lib/firmware/brcm/brcmfmac43436-sdio.bin dpkg-divert --package linux-firmware-raspi2 --rename --remove \ - /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + /lib/firmware/brcm/brcmfmac43436-sdio.clm_blob dpkg-divert --package linux-firmware-raspi2 --rename --remove \ - /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + /lib/firmware/brcm/brcmfmac43436-sdio.txt + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.clm_blob + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43456-sdio.bin + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43456-sdio.clm_blob + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-model-b.txt + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +} + +remove_diversion_4() { + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,400.txt +} + +remove_diversion_5() { + dpkg-divert --package linux-firmware-raspi2 --rename --remove \ + /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob } case "$1" in remove|abort-install|disappear) - remove_diversion_43430 - remove_diversion_43455 + remove_diversion_5 + remove_diversion_4 + remove_diversion_3 + remove_diversion_2 + remove_diversion_1 ;; abort-upgrade) + if dpkg --compare-versions "$2" lt 4-0ubuntu3; then + remove_diversion_5 + fi + if dpkg --compare-versions "$2" lt 4-0ubuntu2; then + remove_diversion_4 + fi + if dpkg --compare-versions "$2" lt 4-0ubuntu1; then + remove_diversion_3 + fi if dpkg --compare-versions "$2" le 1.20200601+arm64-0ubuntu1; then - remove_diversion_43430 + remove_diversion_2 fi if dpkg --compare-versions "$2" lt 1.20200212-0ubuntu; then - remove_diversion_43455 + remove_diversion_1 fi ;; esac diff -Nru linux-firmware-raspi2-3/debian/linux-firmware-raspi2.preinst linux-firmware-raspi2-4/debian/linux-firmware-raspi2.preinst --- linux-firmware-raspi2-3/debian/linux-firmware-raspi2.preinst 2020-10-07 11:23:36.000000000 +0000 +++ linux-firmware-raspi2-4/debian/linux-firmware-raspi2.preinst 2021-04-23 21:05:55.000000000 +0000 @@ -2,33 +2,78 @@ set -e -install_diversion_43430() { +install_diversion_1() { + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.bin + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +} + +install_diversion_2() { dpkg-divert --package linux-firmware-raspi2 --rename --add \ /lib/firmware/brcm/brcmfmac43430-sdio.bin dpkg-divert --package linux-firmware-raspi2 --rename --add \ /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt } -install_diversion_43455() { +install_diversion_3() { dpkg-divert --package linux-firmware-raspi2 --rename --add \ - /lib/firmware/brcm/brcmfmac43455-sdio.bin + /lib/firmware/brcm/brcmfmac43436-sdio.bin dpkg-divert --package linux-firmware-raspi2 --rename --add \ - /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + /lib/firmware/brcm/brcmfmac43436-sdio.clm_blob dpkg-divert --package linux-firmware-raspi2 --rename --add \ - /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + /lib/firmware/brcm/brcmfmac43436-sdio.txt + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.clm_blob + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43456-sdio.bin + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43456-sdio.clm_blob + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-model-b.txt + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +} + +install_diversion_4() { + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,400.txt +} + +install_diversion_5() { + dpkg-divert --package linux-firmware-raspi2 --rename --add \ + /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob } case "$1" in install) - install_diversion_43455 - install_diversion_43430 + install_diversion_1 + install_diversion_2 + install_diversion_3 + install_diversion_4 + install_diversion_5 ;; upgrade) if dpkg --compare-versions "$2" lt 1.20200212-0ubuntu; then - install_diversion_43455 + install_diversion_1 fi if dpkg --compare-versions "$2" le 1.20200601+arm64-0ubuntu1; then - install_diversion_43430 + install_diversion_2 + fi + if dpkg --compare-versions "$2" lt 4-0ubuntu1; then + install_diversion_3 + fi + if dpkg --compare-versions "$2" lt 4-0ubuntu2; then + install_diversion_4 + fi + if dpkg --compare-versions "$2" lt 4-0ubuntu3; then + install_diversion_5 fi ;; esac diff -Nru linux-firmware-raspi2-3/debian/rules linux-firmware-raspi2-4/debian/rules --- linux-firmware-raspi2-3/debian/rules 2021-01-21 16:21:28.000000000 +0000 +++ linux-firmware-raspi2-4/debian/rules 2021-04-23 21:05:55.000000000 +0000 @@ -21,6 +21,10 @@ debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt cp debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.txt \ debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + cp debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.txt \ + debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt + cp debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.txt \ + debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,400.txt rm debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43455-sdio.txt cp debian/linux-firmware-raspi2/lib/firmware/brcm/brcmfmac43456-sdio.txt \ @@ -35,7 +39,7 @@ # Don't strip anything; it's all pre-built binary blobs and some of # it is foreign architecture anyway -BOOTCOMMIT:= 1.20210108 +BOOTCOMMIT:= 1.20210303 BOOTFILES := \ LICENCE.broadcom \ bootcode.bin \ @@ -56,14 +60,14 @@ start_db.elf \ start_x.elf -BTCOMMIT:= 1e4ee0c05bae10002124b56c0e44bb9ac6581ddc +BTCOMMIT:= e7fd166981ab4bb9a36c2d1500205a078a35714d BTFILES := \ BCM43430A1.hcd \ BCM4345C0.hcd \ BCM4345C5.hcd \ BCM43430B0.hcd -WIFICOMMIT:= b66ab26cebff689d0d3257f56912b9bb03c20567 +WIFICOMMIT:= 83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5 WIFIFILES := \ brcmfmac43430-sdio.bin \ brcmfmac43430-sdio.txt \ Binary files /tmp/tmpxv2y_jom/UArVcmRP7X/linux-firmware-raspi2-3/nonfree/brcm/brcmfmac43455-sdio.bin and /tmp/tmpxv2y_jom/OG3aL7gcUl/linux-firmware-raspi2-4/nonfree/brcm/brcmfmac43455-sdio.bin differ