From 38bd71614feb609bcc6433da0df242a9a05d37ab Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 31 Oct 2025 22:29:55 +0100 Subject: [PATCH 1/3] .github: add NanoPi R2S to list of supported boot laoders Also, sort the list alphabetically. Signed-off-by: Joachim Wiberg --- .github/workflows/build-boot.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-boot.yml b/.github/workflows/build-boot.yml index bf445b41..fb06ddcf 100644 --- a/.github/workflows/build-boot.yml +++ b/.github/workflows/build-boot.yml @@ -16,11 +16,12 @@ jobs: fail-fast: false matrix: defconfig: - - fireant_boot - - cn9130_crb_boot - aarch64_qemu_boot - - rpi4_boot - bpi_r3_boot + - cn9130_crb_boot + - fireant_boot + - nanopi_r2s_boot + - rpi4_boot env: MAKEFLAGS: -j5 steps: From 97d4068f68690737ed1320785dc3675a6fbb2e12 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 31 Oct 2025 22:56:10 +0100 Subject: [PATCH 2/3] board: raspberrypi-rpi64: rename SD card image from rpi4 to rpi64 Align the SD card image naming with the board name for consistency. [skip ci] Signed-off-by: Joachim Wiberg --- board/aarch64/raspberrypi-rpi64/README.md | 4 ++-- board/aarch64/raspberrypi-rpi64/genimage.cfg.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/aarch64/raspberrypi-rpi64/README.md b/board/aarch64/raspberrypi-rpi64/README.md index 24d86025..80a844bf 100644 --- a/board/aarch64/raspberrypi-rpi64/README.md +++ b/board/aarch64/raspberrypi-rpi64/README.md @@ -51,9 +51,9 @@ admin@example:/> ### Pre-built images -Pre-built SD card images are available here: [infix-rpi4-sdcard.img][sdcard] +Pre-built SD card images are available here: [infix-rpi64-sdcard.img][sdcard] [0]: https://www.raspberrypi.com/products/raspberry-pi-touch-display/ -[1]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-rpi4-sdcard.img +[1]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-rpi64-sdcard.img [2]: https://kernelkit.org/infix/latest/container/#content-mounts [3]: https://kernelkit.org/infix/latest/scripting-restconf/ diff --git a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in index f78a2979..51e45bd2 100644 --- a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in +++ b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in @@ -29,7 +29,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-rpi4-sdcard.img { +image #INFIX_ID##VERSION#-rpi64-sdcard.img { hdimage { partition-table-type = "hybrid" } From c3b1c2855129eb6bd20193ccd2a76d5a8f7f9140 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 31 Oct 2025 23:13:43 +0100 Subject: [PATCH 3/3] configs: rename rpi4_boot to rpi64_boot for consistency Align bootloader naming with the board name raspberrypi-rpi64. [skip ci] Signed-off-by: Claude --- .github/workflows/build-boot.yml | 2 +- .github/workflows/build-image.yml | 2 +- configs/{rpi4_boot_defconfig => rpi64_boot_defconfig} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename configs/{rpi4_boot_defconfig => rpi64_boot_defconfig} (100%) diff --git a/.github/workflows/build-boot.yml b/.github/workflows/build-boot.yml index fb06ddcf..41a2a758 100644 --- a/.github/workflows/build-boot.yml +++ b/.github/workflows/build-boot.yml @@ -21,7 +21,7 @@ jobs: - cn9130_crb_boot - fireant_boot - nanopi_r2s_boot - - rpi4_boot + - rpi64_boot env: MAKEFLAGS: -j5 steps: diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 2dea91f7..5b565b42 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -54,7 +54,7 @@ jobs: run: | case "${{ inputs.board }}" in raspberrypi-rpi64) - echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV + echo "BOOTLOADER=rpi64_boot" >> $GITHUB_ENV echo "TARGET=aarch64" >> $GITHUB_ENV ;; bananapi-bpi-r3) diff --git a/configs/rpi4_boot_defconfig b/configs/rpi64_boot_defconfig similarity index 100% rename from configs/rpi4_boot_defconfig rename to configs/rpi64_boot_defconfig