rpi-kernel: update to 6.1.54 (and rpi-firmware, rpi-userland, rpi-eeprom)

srcpkgs/rpi-eeprom/template

@@ -1,8 +1,8 @@
 # Template file for 'rpi-eeprom'
 pkgname=rpi-eeprom
-version=2022.05.20
+version=2023.09.29
 revision=1
-_githash="1c758a0904630da2ea905118bdf34fe2d8a6bb5e"
+_githash="4f2d676b4e2a9c2d9ee1ab42015ce711fde97afa"
 archs="armv7* aarch64*"
 conf_files="/etc/default/rpi-eeprom-update"
 depends="binutils pciutils python3 rpi-firmware rpi-userland"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <[email protected]>"
 license="BSD-3-Clause, custom:Proprietary"
 homepage="https://github.com/raspberrypi/rpi-eeprom/"
 distfiles="https://github.com/raspberrypi/rpi-eeprom/archive/${_githash}.tar.gz"
-checksum=ab4e20ef187f1583265c0face1d7d1597df2dc5d0fef697b459794924542388a
+checksum="189c5d37f3102247cec72619e3cb357d027ec526fa3c7373d3107bd6c9e30e29"
 python_version=3
 repository=nonfree
 
@@ -22,7 +22,8 @@ do_install() {
 	vinstall rpi-eeprom-update-default 644 etc/default rpi-eeprom-update
 
 	vmkdir usr/lib/firmware/raspberrypi/bootloader
-	vcopy firmware/* usr/lib/firmware/raspberrypi/bootloader/
+	# need to figure out how to package both pi4 (2711) and pi5 (2712) fw
+	vcopy firmware-2711/* usr/lib/firmware/raspberrypi/bootloader/
 
 	vlicense LICENSE
 }

srcpkgs/rpi-firmware/template

@@ -1,82 +1,78 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
-_gitshort="${_githash:0:7}"
-
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230925
+revision=1
+_rpi_fw=6b37a457122714aa14b2c7df0926455173fd04f1
+_rpi_bt=9556b08ace2a1735127894642cc8ea6529c04c90
+_rpi_brcm=2c3a8701193ba23d0ef85cdf0d0c9e47baf03dfc
+create_wrksrc=yes
 archs="armv6l* armv7l* aarch64*"
-provides="linux-firmware-broadcom-${version}_${revision}"
-replaces="linux-firmware-broadcom>=0"
-short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
+short_desc="Firmware files for the Raspberry Pi"
 maintainer="Piraty <[email protected]>"
 license="BSD-3-Clause, custom:Cypress"
 homepage="https://github.com/raspberrypi/firmware"
-distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909
+distfiles="
+ https://github.com/raspberrypi/firmware/archive/${_rpi_fw}.tar.gz
+ https://github.com/RPi-Distro/firmware-nonfree/archive/${_rpi_brcm}.tar.gz
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/broadcom/BCM43430A1.hcd
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/broadcom/BCM4345C0.hcd
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/broadcom/BCM43430B0.hcd
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/broadcom/BCM4345C5.hcd
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/synaptics/SYN43430A1.hcd>BCM43430A1.raspberrypi,model-zero-2-w.hcd
+ https://github.com/RPi-Distro/bluez-firmware/raw/${_rpi_bt}/synaptics/SYN43430B0.hcd>BCM43430B0.raspberrypi,model-zero-2-w.hcd
+ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/LICENCE.cypress>LICENCE.cypress"
+checksum="913986b1be22b8dc30a3e6a9b5a28316b1bbee7bec90040ddefff0d7512560f4
+ 9156d90116b921d2e7938b52fad84fbe1d96df622a66c5db09569c735832387a
+ c096ad4a5c3f06ed7d69eba246bf89ada9acba64a5b6f51b1e9c12f99bb1e1a7
+ 51c45e77ddad91a19e96dc8fb75295b2087c279940df2634b23baf71b6dea42c
+ 338c2c6631131f516bfc7e64ef0872bd0402e1f98ef9d0c900eef0c814d90a25
+ fb9f4ec2df5301bd35f416384e103c012c5983024c49aa72fbbaf90177512caa
+ 55071227c94d86369d04f9aff3bbfd4197a78a53dc350295123e1a8b048bba8f
+ 338c2c6631131f516bfc7e64ef0872bd0402e1f98ef9d0c900eef0c814d90a25
+ ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f"
+
+skip_extraction="BCM43430A1.hcd BCM4345C0.hcd BCM43430B0.hcd BCM4345C5.hcd
+ BCM43430A1.raspberrypi,model-zero-2-w.hcd BCM43430B0.raspberrypi,model-zero-2-w.hcd
+ LICENCE.cypress"
+
+provides="linux-firmware-broadcom-${version}_${revision}"
+replaces="linux-firmware-broadcom>=0"
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
 do_install() {
-	rm -f boot/*.img
-	rm -rf boot/overlays
-	rm -f boot/*.dtb
-	rm -f boot/COPYING.linux
-
-	vlicense boot/LICENCE.broadcom
-	rm -f boot/LICENCE.broadcom
+	# bootloader
+	vlicense "firmware-${_rpi_fw}/boot/LICENCE.broadcom"
+	rm -rf "firmware-${_rpi_fw}/boot/"*.img \
+		"firmware-${_rpi_fw}/boot/overlays" \
+		"firmware-${_rpi_fw}/boot/"*.dtb \
+		"firmware-${_rpi_fw}/boot/COPYING.linux" \
+		"firmware-${_rpi_fw}/boot/LICENCE.broadcom"
 
 	vmkdir boot
-	cp -R boot/* ${DESTDIR}/boot
+	vcopy "firmware-${_rpi_fw}/boot/*" boot
 
 	# Install configuration files.
-	vinstall ${FILESDIR}/cmdline.txt 644 boot
-	vinstall ${FILESDIR}/config.txt 644 boot
+	vinstall "${FILESDIR}/cmdline.txt" 644 boot
+	vinstall "${FILESDIR}/config.txt" 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
-	vlicense LICENCE.cypress
+	# firmware
+	# we can use either the -standard or -minimal 43455 file so use standard by default
+	ln -sfv cyfmac43455-sdio-standard.bin "firmware-nonfree-${_rpi_brcm}/debian/config/brcm80211/cypress/cyfmac43455-sdio.bin"
+	vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENCE.cypress"
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	# add original Pi Foundation firmware files
+	# install deref's symlinks and copies a whole file, which makes rpi use duplicated variants specifically from downstream firmware
+	install -Dm644 \
+		"firmware-nonfree-${_rpi_brcm}/debian/config/brcm80211/brcm/"brcmfmac*raspberrypi* \
+		-t "${DESTDIR}/usr/lib/firmware/brcm"
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	# but 43436/43436s/43456 is not in linux-firmware, so copy it normally
+	vcopy "firmware-nonfree-${_rpi_brcm}/debian/config/brcm80211/brcm/brcmfmac43456"* usr/lib/firmware/brcm
+	vcopy "firmware-nonfree-${_rpi_brcm}/debian/config/brcm80211/brcm/brcmfmac43436"* usr/lib/firmware/brcm
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for file in "${XBPS_SRCDISTDIR}/${pkgname}-${version}/"*.hcd; do
+		vinstall "$file" 0644 usr/lib/firmware/brcm
 	done
-
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
-
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
 }