Skip to content

Commit d3f3a3a

Browse files
kfox1111kfox1111
authored
Add support for rpi zero 2 w (#24)
* Add support for rpi zero 2 w Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix typo Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix formatting Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix typo Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix formatting Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Log more Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Log more Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Copy this way Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Update the bib Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Update firmware Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix filename. Add details to readme. Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> * Fix firmware reference Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov> --------- Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
1 parent 5ef55b9 commit d3f3a3a

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

‎.github/actions/shared-steps/action.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,6 @@ runs:
136136
-f ${{ inputs.VERSION_MAJOR }}-rpi/bootstrap-image/Dockerfile \
137137
--build-arg=BASE=localhost/${{ env.IMAGE_NAME }}:${{ inputs.VERSION_MAJOR }}${{ env.VERSION_MINOR }}-${{ inputs.DATE_STAMP }}-${{ env.CLEAN_ARCH }} \
138138
${{ inputs.VERSION_MAJOR }}-rpi/bootstrap-image && \
139-
git clone https://github.com/osbuild/bootc-image-builder && \
140-
cd bootc-image-builder/bib && \
141-
sudo podman run -i --rm -v $(pwd):/build registry.fedoraproject.org/fedora:42 /bin/bash -c "cd /build; dnf install -y git-core golang gpgme-devel libassuan-devel && go mod edit --replace github.com/osbuild/images=github.com/kfox1111/images@kfox-test && go mod tidy" && \
142-
cd ../ && \
143-
make build-container && \
144-
cd ../ && \
145139
sudo podman tag localhost/${{ env.IMAGE_NAME }}:${{ inputs.VERSION_MAJOR }}${{ env.VERSION_MINOR }}-bootstrap-${{ inputs.DATE_STAMP }}-${{ env.CLEAN_ARCH }} quay.io/almalinuxorg/almalinux-bootc-rpi:${{ inputs.VERSION_MAJOR }}
146140
sudo podman run \
147141
--rm \
@@ -150,7 +144,8 @@ runs:
150144
--security-opt label=type:unconfined_t \
151145
-v $(pwd)/output:/output \
152146
-v /var/lib/containers/storage:/var/lib/containers/storage \
153-
localhost/bootc-image-builder:latest \
147+
quay.io/centos-bootc/bootc-image-builder:latest \
148+
--no-default-kernel-args \
154149
--config /output/bib-config.toml \
155150
--type raw \
156151
--rootfs xfs \

‎10-kitten-rpi/Containerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ RUN \
2424
curl -L -o firmware.tar.gz https://github.com/RPi-Distro/firmware-nonfree/archive/223ccf3a3ddb11b3ea829749fbbba4d65b380897/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz && \
2525
tar -zxvf firmware.tar.gz && \
2626
ln -s cyfmac43455-sdio-standard.bin firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/cypress/cyfmac43455-sdio.bin && \
27+
rm -f /target-rootfs/usr/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt* && \
28+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43436s-sdio.bin /target-rootfs/usr/lib/firmware/brcm/ && \
29+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin /target-rootfs/usr/lib/firmware/brcm/ && \
30+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt /target-rootfs/usr/lib/firmware/brcm/ && \
2731
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin /target-rootfs/usr/lib/firmware/brcm/ && \
2832
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob /target-rootfs/usr/lib/firmware/brcm/ && \
2933
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt /target-rootfs/usr/lib/firmware/brcm/ && \

‎10-rpi/Containerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ RUN \
2222
curl -o /target-rootfs/usr/bin/rpi-bootc-bootloader https://raw.githubusercontent.com/kfox1111/rpi-bootc-bootloader/refs/tags/v0.0.8/rpi-bootc-bootloader && \
2323
chmod +x /target-rootfs/usr/bin/rpi-bootc-bootloader && \
2424
curl -L -o firmware.tar.gz https://github.com/RPi-Distro/firmware-nonfree/archive/223ccf3a3ddb11b3ea829749fbbba4d65b380897/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz && \
25-
curl -L -o firmware.tar.gz https://github.com/RPi-Distro/firmware-nonfree/archive/223ccf3a3ddb11b3ea829749fbbba4d65b380897/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz && \
2625
tar -zxvf firmware.tar.gz && \
2726
ln -s cyfmac43455-sdio-standard.bin firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/cypress/cyfmac43455-sdio.bin && \
27+
rm -f /target-rootfs/usr/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt* && \
28+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43436s-sdio.bin /target-rootfs/usr/lib/firmware/brcm/ && \
29+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin /target-rootfs/usr/lib/firmware/brcm/ && \
30+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt /target-rootfs/usr/lib/firmware/brcm/ && \
2831
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin /target-rootfs/usr/lib/firmware/brcm/ && \
2932
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob /target-rootfs/usr/lib/firmware/brcm/ && \
3033
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt /target-rootfs/usr/lib/firmware/brcm/ && \

‎9-rpi/Containerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ RUN \
2222
curl -o /target-rootfs/usr/bin/rpi-bootc-bootloader https://raw.githubusercontent.com/kfox1111/rpi-bootc-bootloader/refs/tags/v0.0.8/rpi-bootc-bootloader && \
2323
chmod +x /target-rootfs/usr/bin/rpi-bootc-bootloader && \
2424
curl -L -o firmware.tar.gz https://github.com/RPi-Distro/firmware-nonfree/archive/223ccf3a3ddb11b3ea829749fbbba4d65b380897/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz && \
25-
curl -L -o firmware.tar.gz https://github.com/RPi-Distro/firmware-nonfree/archive/223ccf3a3ddb11b3ea829749fbbba4d65b380897/firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz && \
2625
tar -zxvf firmware.tar.gz && \
2726
ln -s cyfmac43455-sdio-standard.bin firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/cypress/cyfmac43455-sdio.bin && \
27+
rm -f /target-rootfs/usr/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt* && \
28+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43436s-sdio.bin /target-rootfs/usr/lib/firmware/brcm/ && \
29+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin /target-rootfs/usr/lib/firmware/brcm/ && \
30+
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt /target-rootfs/usr/lib/firmware/brcm/ && \
2831
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin /target-rootfs/usr/lib/firmware/brcm/ && \
2932
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob /target-rootfs/usr/lib/firmware/brcm/ && \
3033
install -c -m 644 firmware-nonfree-223ccf3a3ddb11b3ea829749fbbba4d65b380897/debian/config/brcm80211/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt /target-rootfs/usr/lib/firmware/brcm/ && \

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ You can then look at the README.txt on the storage device along with customizing
4040

4141
Move the storage device to the PI and boot.
4242

43+
It has been tested on:
44+
* several rpi5 versions including 2g, 8g, and 16g
45+
* rpi4
46+
* rpi3
47+
* rpi zero 2 w
48+
4349
## Project Status & News
4450

4551
* **[2025-06-10]** Forked repo for RPI specific images

0 commit comments

Comments
 (0)