From b995c3aa641c38f716e3040981114fe9e6a78e57 Mon Sep 17 00:00:00 2001 From: Benedikt Niedermayr Date: Wed, 21 Jan 2026 19:05:53 +0100 Subject: [PATCH 1/2] kas: bump isar and isar-cip-core Bump isar and isar-cip-core to current master. Using "next" for the isar-cip-core is dangerous since the branch is getting rebased occasionally. Signed-off-by: Benedikt Niedermayr --- kas/common/base.lock.yml | 2 +- kas/opt/ab-rootfs.lock.yml | 2 +- kas/opt/ab-rootfs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kas/common/base.lock.yml b/kas/common/base.lock.yml index 1e46ceca..a7297ce4 100644 --- a/kas/common/base.lock.yml +++ b/kas/common/base.lock.yml @@ -3,4 +3,4 @@ header: overrides: repos: isar: - commit: 680c07ee072483329885ba08b7b2b1f763326dc8 + commit: c92b7c95b0b867aa477396cb331c28601ce9e5ec diff --git a/kas/opt/ab-rootfs.lock.yml b/kas/opt/ab-rootfs.lock.yml index b51638a3..1d15a96c 100644 --- a/kas/opt/ab-rootfs.lock.yml +++ b/kas/opt/ab-rootfs.lock.yml @@ -3,4 +3,4 @@ header: overrides: repos: cip-core: - commit: c75b584f32411a03c3ca9a9b023cd4e74d79d32f + commit: 2647471156b128bf8b0fb1d726bd05099fbbe1bd diff --git a/kas/opt/ab-rootfs.yml b/kas/opt/ab-rootfs.yml index 620cd916..a892c64d 100644 --- a/kas/opt/ab-rootfs.yml +++ b/kas/opt/ab-rootfs.yml @@ -18,7 +18,7 @@ repos: cip-core: url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git - branch: next + branch: master local_conf_header: partition-uuids: | From 1ca940fa04f56dd3ea0c15dc7732494568baa483 Mon Sep 17 00:00:00 2001 From: Benedikt Niedermayr Date: Tue, 27 Jan 2026 13:59:23 +0100 Subject: [PATCH 2/2] fix(rpi4b-ebg): upgrade to trixie This fixes booting the image for the rpi4b-ebg target. The used u-boot verion on debian-bookworm (2023.01+dfsg-2+deb12u2) refuses to boot on rpi4 platforms: ``` Found EFI removable media binary efi/boot/bootaa64.efi ** Reading file would overwrite reserved memory ** Failed to load 'efi/boot/bootaa64.efi' ``` Important fixes have been added to u-boot 2023.04 regarding the lmb implementation which fixes the above error. The easiest fix is to just upgrade to debian trixie. Signed-off-by: Benedikt Niedermayr --- kas/debian/mtda-rpi4b-ebg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas/debian/mtda-rpi4b-ebg.yml b/kas/debian/mtda-rpi4b-ebg.yml index 05771757..a7d61866 100644 --- a/kas/debian/mtda-rpi4b-ebg.yml +++ b/kas/debian/mtda-rpi4b-ebg.yml @@ -16,5 +16,5 @@ header: version: 17 includes: - kas/common/base.yml - - kas/debian/bookworm-base.yml + - kas/debian/trixie-base.yml - kas/opt/ab-rootfs.yml