From: Mark Kettenis <mark.kettenis@xs4all.nl>
Subject: Re: add rpi zero 2 w dtb to install media
To: Jonathan Gray <jsg@jsg.id.au>
Cc: tech@openbsd.org
Date: Thu, 04 Sep 2025 11:34:31 +0200

> Date: Tue, 2 Sep 2025 23:44:45 +1000
> From: Jonathan Gray <jsg@jsg.id.au>
> 
> The dtb for the Zero 2 W is not included in the arm64 install media.
> I don't have the hardware, but have checked that arm64 release still
> fits with the following diff.
> 
> raspberrypi-firmware includes:
> bcm2710-rpi-zero-2.dtb
> bcm2710-rpi-zero-2-w.dtb
> 
> There is no publically released non-w model.
> And bcm2710-rpi-zero-2.dts is just
> #include "bcm2710-rpi-zero-2-w.dts"
> https://github.com/raspberrypi/linux/blob/rpi-6.12.y/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
> 
> start.elf seems to check for both names

ok kettenis@

> Index: distrib/arm64/iso/Makefile
> ===================================================================
> RCS file: /cvs/src/distrib/arm64/iso/Makefile,v
> diff -u -p -r1.13 Makefile
> --- distrib/arm64/iso/Makefile	1 Sep 2025 18:56:04 -0000	1.13
> +++ distrib/arm64/iso/Makefile	2 Sep 2025 01:17:39 -0000
> @@ -37,6 +37,7 @@ PIFILES=\
>  	bcm2710-rpi-3-b.dtb \
>  	bcm2710-rpi-3-b-plus.dtb \
>  	bcm2710-rpi-cm3.dtb \
> +	bcm2710-rpi-zero-2-w.dtb \
>  	bcm2711-rpi-4-b.dtb \
>  	bcm2711-rpi-400.dtb \
>  	bcm2711-rpi-cm4.dtb \
> Index: distrib/arm64/ramdisk/Makefile
> ===================================================================
> RCS file: /cvs/src/distrib/arm64/ramdisk/Makefile,v
> diff -u -p -r1.33 Makefile
> --- distrib/arm64/ramdisk/Makefile	1 Sep 2025 18:56:04 -0000	1.33
> +++ distrib/arm64/ramdisk/Makefile	2 Sep 2025 01:17:39 -0000
> @@ -39,6 +39,7 @@ PIFILES=\
>  	bcm2710-rpi-3-b.dtb \
>  	bcm2710-rpi-3-b-plus.dtb \
>  	bcm2710-rpi-cm3.dtb \
> +	bcm2710-rpi-zero-2-w.dtb \
>  	bcm2711-rpi-4-b.dtb \
>  	bcm2711-rpi-400.dtb \
>  	bcm2711-rpi-cm4.dtb \
> Index: distrib/arm64/ramdisk/list
> ===================================================================
> RCS file: /cvs/src/distrib/arm64/ramdisk/list,v
> diff -u -p -r1.24 list
> --- distrib/arm64/ramdisk/list	1 Sep 2025 18:56:04 -0000	1.24
> +++ distrib/arm64/ramdisk/list	2 Sep 2025 01:17:39 -0000
> @@ -107,6 +107,7 @@ COPY	/usr/local/share/raspberrypi-firmwa
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b.dtb usr/mdec/rpi/bcm2710-rpi-3-b.dtb
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b-plus.dtb usr/mdec/rpi/bcm2710-rpi-3-b-plus.dtb
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-cm3.dtb usr/mdec/rpi/bcm2710-rpi-cm3.dtb
> +COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-zero-2-w.dtb usr/mdec/rpi/bcm2710-rpi-zero-2-w.dtb
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2711-rpi-4-b.dtb usr/mdec/rpi/bcm2711-rpi-4-b.dtb
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2711-rpi-400.dtb usr/mdec/rpi/bcm2711-rpi-400.dtb
>  COPY	/usr/local/share/raspberrypi-firmware/boot/bcm2711-rpi-cm4.dtb usr/mdec/rpi/bcm2711-rpi-cm4.dtb
> 
>