[PATCH 1/3] add efi booting support for rpi-arm64-v8

[Felix Moessbauer]

Booting the RPI via EFI makes it much easier to decouple the image
contents, firmware, boot config and kernel cmdline. For that, we add a
new target rpi-arm64-v8-efi that boots the RPI using u-boot efi. We
further switch that target to debian bookworm (instead of raspios
bookworm) and by that have a baseline that is closer to upstream.

The recipes are written in a way to make it easy to customize in
downstream layers and only carry a bare minimum of configuration.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
meta-isar/conf/machine/rpi-arm64-v8-efi.conf | 6 +++++
meta-isar/conf/machine/rpi-arm64-v8-efi.inc | 22 +++++++++++++++++++
meta-isar/conf/mc.conf | 1 +
.../rpi-arm64-v8-efi-bookworm.conf | 5 +++++
.../bootconfig-rpi-efi/bootconfig-rpi-efi.bb | 19 ++++++++++++++++
.../bootconfig-rpi-efi/files/config.txt | 9 ++++++++
.../firmware-rpi/files/debian/install | 5 +++++
.../firmware-rpi/files/debian/rules | 7 ++++++
.../firmware-rpi/firmware-rpi_1.20250305.bb | 22 +++++++++++++++++++
.../lib/wic/canned-wks/rpi-arm64-v8-efi.wks | 4 ++++
10 files changed, 100 insertions(+)
create mode 100644 meta-isar/conf/machine/rpi-arm64-v8-efi.conf
create mode 100644 meta-isar/conf/machine/rpi-arm64-v8-efi.inc
create mode 100644 meta-isar/conf/multiconfig/rpi-arm64-v8-efi-bookworm.conf
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi-efi/bootconfig-rpi-efi.bb
create mode 100644 meta-isar/recipes-bsp/bootconfig-rpi-efi/files/config.txt
create mode 100644 meta-isar/recipes-bsp/firmware-rpi/files/debian/install
create mode 100644 meta-isar/recipes-bsp/firmware-rpi/files/debian/rules
create mode 100644 meta-isar/recipes-bsp/firmware-rpi/firmware-rpi_1.20250305.bb
create mode 100644 meta-isar/scripts/lib/wic/canned-wks/rpi-arm64-v8-efi.wks

diff --git a/meta-isar/conf/machine/rpi-arm64-v8-efi.conf b/meta-isar/conf/machine/rpi-arm64-v8-efi.conf
new file mode 100644
index 00000000..dfa93e67
--- /dev/null
+++ b/meta-isar/conf/machine/rpi-arm64-v8-efi.conf
@@ -0,0 +1,6 @@
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens
+
+require conf/machine/rpi-arm64-v8-efi.inc
+
+IMAGER_INSTALL:wic += "${SYSTEMD_BOOTLOADER_INSTALL}"
diff --git a/meta-isar/conf/machine/rpi-arm64-v8-efi.inc b/meta-isar/conf/machine/rpi-arm64-v8-efi.inc
new file mode 100644
index 00000000..cca577ea
--- /dev/null
+++ b/meta-isar/conf/machine/rpi-arm64-v8-efi.inc
@@ -0,0 +1,22 @@
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens
+
+DISTRO_ARCH ?= "arm64"
+KERNEL_NAME ?= "arm64"
+
+IMAGE_FSTYPES ?= "wic"
+WKS_FILE ?= "rpi-arm64-v8-efi.wks"
+
+IMAGER_BUILD_DEPS = "bootconfig-rpi-efi"
+IMAGER_INSTALL:wic += "${IMAGER_BUILD_DEPS}"
+
+IMAGE_EFI_BOOT_FILES = " \
+ /usr/lib/bootconfig-rpi-efi/config.txt;config.txt \
+ /usr/lib/u-boot/rpi_arm64/u-boot.bin;u-boot.bin \
+ /usr/lib/rpi-firmware/fixup4.dat;fixup4.dat \
+ /usr/lib/rpi-firmware/start4.elf;start4.elf \
+ /usr/lib/rpi-firmware/overlays/*;overlays/ \
+ ${IMAGE_ROOTFS}/usr/lib/linux-image-*/broadcom/bcm2711-rpi-4*.dtb \
+"
+
+IMAGE_PREINSTALL:append = " firmware-brcm80211"
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 55969c7b..493d5ae2 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -61,6 +61,7 @@ BBMULTICONFIG = " \
rpi-arm-v7l-bookworm \
rpi-arm64-v8-bullseye \
rpi-arm64-v8-bookworm \
+ rpi-arm64-v8-efi-bookworm \
sifive-fu540-trixie \
starfive-visionfive2-trixie \
qemuarm64-focal \
diff --git a/meta-isar/conf/multiconfig/rpi-arm64-v8-efi-bookworm.conf b/meta-isar/conf/multiconfig/rpi-arm64-v8-efi-bookworm.conf
new file mode 100644
index 00000000..2fdde790
--- /dev/null
+++ b/meta-isar/conf/multiconfig/rpi-arm64-v8-efi-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of Isar.
+# Copyright (C) 2025 Siemens
+
+MACHINE ?= "rpi-arm64-v8-efi"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi-efi/bootconfig-rpi-efi.bb b/meta-isar/recipes-bsp/bootconfig-rpi-efi/bootconfig-rpi-efi.bb
new file mode 100644
index 00000000..5c80721f
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi-efi/bootconfig-rpi-efi.bb
@@ -0,0 +1,19 @@
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens
+
+inherit dpkg-raw
+
+SRC_URI = "file://config.txt"
+
+DESCRIPTION = "Raspberry Pi config to boot using U-Boot EFI"
+MAINTAINER = "isar-users <isar-...@googlegroups.com>"
+
+DPKG_ARCH = "arm64"
+DEBIAN_DEPENDS = "firmware-rpi, u-boot-rpi"
+RDEPENDS:${PN} += "firmware-rpi"
+
+do_install[cleandirs] += "${D}/usr/lib/${BPN}"
+do_install() {
+ DST=${D}/usr/lib/${BPN}
+ install -m 0644 ${WORKDIR}/config.txt $DST
+}
diff --git a/meta-isar/recipes-bsp/bootconfig-rpi-efi/files/config.txt b/meta-isar/recipes-bsp/bootconfig-rpi-efi/files/config.txt
new file mode 100644
index 00000000..1748bfcf
--- /dev/null
+++ b/meta-isar/recipes-bsp/bootconfig-rpi-efi/files/config.txt
@@ -0,0 +1,9 @@
+arm_64bit=1
+arm_boost=1
+enable_uart=1
+uart_2ndstage=1
+disable_commandline_tags=1
+kernel=u-boot.bin
+
+[pi4]
+max_framebuffers=2
diff --git a/meta-isar/recipes-bsp/firmware-rpi/files/debian/install b/meta-isar/recipes-bsp/firmware-rpi/files/debian/install
new file mode 100644
index 00000000..96265f9f
--- /dev/null
+++ b/meta-isar/recipes-bsp/firmware-rpi/files/debian/install
@@ -0,0 +1,5 @@
+boot/bootcode.bin usr/lib/rpi-firmware
+boot/LICENCE.broadcom usr/lib/rpi-firmware
+boot/*.dat usr/lib/rpi-firmware
+boot/*.dtb usr/lib/rpi-firmware
+boot/*.elf usr/lib/rpi-firmware
diff --git a/meta-isar/recipes-bsp/firmware-rpi/files/debian/rules b/meta-isar/recipes-bsp/firmware-rpi/files/debian/rules
new file mode 100644
index 00000000..5ed0ca99
--- /dev/null
+++ b/meta-isar/recipes-bsp/firmware-rpi/files/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_strip:
+override_dh_dwz:
diff --git a/meta-isar/recipes-bsp/firmware-rpi/firmware-rpi_1.20250305.bb b/meta-isar/recipes-bsp/firmware-rpi/firmware-rpi_1.20250305.bb
new file mode 100644
index 00000000..e88b08e7
--- /dev/null
+++ b/meta-isar/recipes-bsp/firmware-rpi/firmware-rpi_1.20250305.bb
@@ -0,0 +1,22 @@
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens
+
+inherit dpkg
+
+DESCRIPTION = "Raspberry Pi firmware blobs"
+MAINTAINER = "isar-users <isar-...@googlegroups.com>"
+
+SRC_URI = " \
+ https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \
+ file://debian/install \
+ file://debian/rules \
+"
+SRC_URI[sha256sum] = "4981021b82f600f450d64d9b82034dc603bf5429889a3947b2863e01992a343c"
+
+S = "${WORKDIR}/firmware-${PV}"
+
+do_prepare_build[cleandirs] += "${S}/debian"
+do_prepare_build() {
+ deb_debianize
+ cp -r ${WORKDIR}/debian ${S}
+}
diff --git a/meta-isar/scripts/lib/wic/canned-wks/rpi-arm64-v8-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/rpi-arm64-v8-efi.wks
new file mode 100644
index 00000000..560e38b0
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/rpi-arm64-v8-efi.wks
@@ -0,0 +1,4 @@
+part /boot --source bootimg-efi-isar --use-uuid --sourceparams "loader=systemd-boot" --label efi --part-type EF00 --align 8192 --size 256M
+part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 8192 --exclude-path boot/ --extra-space 1G
+
+bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS1,115200 module_blacklist=vc4"
--
2.49.0

[Baurzhan Ismagulov]

On 2025-06-04 15:28, 'Felix Moessbauer' via isar-users wrote:
> Booting the RPI via EFI makes it much easier to decouple the image
> contents, firmware, boot config and kernel cmdline. For that, we add a
> new target rpi-arm64-v8-efi that boots the RPI using u-boot efi. We
> further switch that target to debian bookworm (instead of raspios
> bookworm) and by that have a baseline that is closer to upstream.
>
> The recipes are written in a way to make it easy to customize in
> downstream layers and only carry a bare minimum of configuration.

Applied to next, thanks.

With kind regards,
Baurzhan