[v3] Add trixie support for raspberry pi targets

diff --git a/kas/distro/Kconfig b/kas/distro/Kconfig
index 9dadc52e..731be6ca 100644
--- a/kas/distro/Kconfig
+++ b/kas/distro/Kconfig
@@ -83,6 +83,10 @@  config RASPIOS_BOOKWORM
 	bool "Raspberry Pi OS Debian 12 (bookworm)"
 	depends on (DISTRO_RASPIOS && CODENAME_BOOKWORM) || ANY_MACHINE_DISTRO
 
+config RASPIOS_TRIXIE
+	bool "Raspberry Pi OS Debian 13 (trixie)"
+	depends on (DISTRO_RASPIOS && CODENAME_TRIXIE) || ANY_MACHINE_DISTRO
+
 config UBUNTU_FOCAL
 	bool "Ubuntu 20.04 (Focal)"
 	depends on (DISTRO_UBUNTU && CODENAME_FOCAL) || ANY_MACHINE_DISTRO
@@ -118,6 +122,7 @@  config KAS_INCLUDE_DISTRO
 	default "kas/distro/debian-sid.yaml" if DEBIAN_SID
 	default "kas/distro/raspios-bullseye.yaml" if RASPIOS_BULLSEYE
 	default "kas/distro/raspios-bookworm.yaml" if RASPIOS_BOOKWORM
+    default "kas/distro/raspios-trixie.yaml" if RASPIOS_TRIXIE
 	default "kas/distro/ubuntu-focal.yaml" if UBUNTU_FOCAL
 	default "kas/distro/ubuntu-jammy.yaml" if UBUNTU_JAMMY
 	default "kas/distro/ubuntu-noble.yaml" if UBUNTU_NOBLE
diff --git a/kas/distro/raspios-trixie.yaml b/kas/distro/raspios-trixie.yaml
new file mode 100644
index 00000000..6a77b435
--- /dev/null
+++ b/kas/distro/raspios-trixie.yaml
@@ -0,0 +1,7 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+header:
+  version: 14
+
+distro: raspios-trixie
diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
index 04881a4b..7d01ca92 100644
--- a/kas/machine/Kconfig
+++ b/kas/machine/Kconfig
@@ -178,6 +178,7 @@  config MACHINE_RPI_ARM_V7
 	select DISTRO_RASPIOS
 	select CODENAME_BULLSEYE
 	select CODENAME_BOOKWORM
+	select CODENAME_TRIXIE
 	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM_V7L
@@ -185,6 +186,7 @@  config MACHINE_RPI_ARM_V7L
 	select DISTRO_RASPIOS
 	select CODENAME_BULLSEYE
 	select CODENAME_BOOKWORM
+	select CODENAME_TRIXIE
 	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM
@@ -192,6 +194,7 @@  config MACHINE_RPI_ARM
 	select DISTRO_RASPIOS
 	select CODENAME_BULLSEYE
 	select CODENAME_BOOKWORM
+	select CODENAME_TRIXIE
 	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM64_V8
@@ -199,6 +202,7 @@  config MACHINE_RPI_ARM64_V8
 	select DISTRO_RASPIOS
 	select CODENAME_BULLSEYE
 	select CODENAME_BOOKWORM
+	select CODENAME_TRIXIE
 	select ARCH_ARM64
 
 config MACHINE_RPI_ARM64_V8_EFI
diff --git a/meta-isar/conf/distro/raspios-trixie-64.list b/meta-isar/conf/distro/raspios-trixie-64.list
new file mode 100644
index 00000000..fe981870
--- /dev/null
+++ b/meta-isar/conf/distro/raspios-trixie-64.list
@@ -0,0 +1,9 @@ 
+deb	http://deb.debian.org/debian trixie main contrib non-free
+deb-src	http://deb.debian.org/debian trixie main contrib non-free
+deb	http://deb.debian.org/debian-security trixie-security/updates main contrib non-free
+deb-src	http://deb.debian.org/debian-security trixie-security/updates main contrib non-free
+deb	http://deb.debian.org/debian trixie-updates main contrib non-free
+deb-src	http://deb.debian.org/debian trixie-updates main contrib non-free
+
+deb http://archive.raspberrypi.org/debian trixie main
+deb-src http://archive.raspberrypi.org/debian trixie main
diff --git a/meta-isar/conf/distro/raspios-trixie.conf b/meta-isar/conf/distro/raspios-trixie.conf
new file mode 100644
index 00000000..06deab85
--- /dev/null
+++ b/meta-isar/conf/distro/raspios-trixie.conf
@@ -0,0 +1,35 @@ 
+# Raspberry Pi OS stable distribution configuration
+#
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+BASE_DISTRO = "raspios"
+BASE_DISTRO:arm64 = "raspios64"
+
+HOST_BASE_DISTRO ?= "debian"
+
+BASE_DISTRO_CODENAME = "trixie"
+HOST_DISTRO ?= "debian-trixie"
+HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
+
+DISTRO_APT_SOURCES ?= "conf/distro/raspios-trixie.list"
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/raspios-trixie-64.list"
+# workaround for https://wiki.debian.org/Teams/Apt/Sha1Removal
+DISTRO_MM_OPTS += "${MMAPTOPT_NOEXPKEYSIGN}"
+
+DISTRO_BOOTSTRAP_KEYS = "http://raspbian.raspberrypi.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
+DISTRO_BOOTSTRAP_KEYS:arm64 = ""
+
+DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8"
+
+THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key;sha256sum=76603890d82a492175caf17aba68dc73acb1189c9fd58ec0c19145dfa3866d56"
+
+COMPAT_DISTRO_ARCH:arm64 = "armhf"
+
+DISTRO_GCC = "14"
+
+DEBIAN_COMPAT = "13"
+
+DEBIAN_STANDARDS_VERSION ?= "4.7.2"
+
+IMAGE_PREINSTALL:append = " systemd-sysv"
diff --git a/meta-isar/conf/distro/raspios-trixie.list b/meta-isar/conf/distro/raspios-trixie.list
new file mode 100644
index 00000000..20e1e945
--- /dev/null
+++ b/meta-isar/conf/distro/raspios-trixie.list
@@ -0,0 +1,5 @@ 
+deb http://raspbian.raspberrypi.org/raspbian trixie main contrib non-free rpi
+deb-src http://raspbian.raspberrypi.org/raspbian trixie main contrib non-free rpi
+
+deb http://archive.raspberrypi.org/debian trixie main
+deb-src http://archive.raspberrypi.org/debian trixie main
diff --git a/meta-isar/conf/machine/rpi-arm-v7.conf b/meta-isar/conf/machine/rpi-arm-v7.conf
index f71d15f1..cdeacafd 100644
--- a/meta-isar/conf/machine/rpi-arm-v7.conf
+++ b/meta-isar/conf/machine/rpi-arm-v7.conf
@@ -1,7 +1,10 @@ 
 # This software is a part of Isar.
-# Copyright (C) 2022 ilbers GmbH
+# Copyright (C) 2022,2026 ilbers GmbH
 
 DISTRO_ARCH ?= "armhf"
 KERNEL_NAME = "kernel7"
 
 include conf/machine/rpi-common.conf
+
+KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v7"
+KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v7"
diff --git a/meta-isar/conf/machine/rpi-arm-v7l.conf b/meta-isar/conf/machine/rpi-arm-v7l.conf
index 7c20baae..d455a69d 100644
--- a/meta-isar/conf/machine/rpi-arm-v7l.conf
+++ b/meta-isar/conf/machine/rpi-arm-v7l.conf
@@ -1,7 +1,10 @@ 
 # This software is a part of Isar.
-# Copyright (C) 2022 ilbers GmbH
+# Copyright (C) 2022,2026 ilbers GmbH
 
 DISTRO_ARCH ?= "armhf"
 KERNEL_NAME = "kernel7l"
 
 include conf/machine/rpi-common.conf
+
+KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v7"
+KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v7"
diff --git a/meta-isar/conf/machine/rpi-arm.conf b/meta-isar/conf/machine/rpi-arm.conf
index 98bb3880..f0ff72de 100644
--- a/meta-isar/conf/machine/rpi-arm.conf
+++ b/meta-isar/conf/machine/rpi-arm.conf
@@ -1,7 +1,10 @@ 
 # This software is a part of Isar.
-# Copyright (C) 2022 ilbers GmbH
+# Copyright (C) 2022,2026 ilbers GmbH
 
 DISTRO_ARCH ?= "armhf"
 KERNEL_NAME = "kernel"
 
 include conf/machine/rpi-common.conf
+
+KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v6"
+KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v6"
diff --git a/meta-isar/conf/machine/rpi-arm64-v8.conf b/meta-isar/conf/machine/rpi-arm64-v8.conf
index 89a5b999..a1fdec89 100644
--- a/meta-isar/conf/machine/rpi-arm64-v8.conf
+++ b/meta-isar/conf/machine/rpi-arm64-v8.conf
@@ -1,7 +1,10 @@ 
 # This software is a part of Isar.
-# Copyright (C) 2022 ilbers GmbH
+# Copyright (C) 2022,2026 ilbers GmbH
 
 DISTRO_ARCH ?= "arm64"
 KERNEL_NAME = "kernel8"
 
 include conf/machine/rpi-common.conf
+
+KERNEL_IMAGE_PKG:trixie = "linux-image-rpi-v8"
+KERNEL_HEADERS_PKG:trixie = "linux-headers-rpi-v8"
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index 9dd70f99..46e37657 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -16,20 +16,32 @@  KERNEL_TYPE = "raspios"
 KERNEL_IMAGE_PKG ?= "raspberrypi-kernel"
 KERNEL_HEADERS_PKG ?= "raspberrypi-kernel-headers"
 
-IMAGE_PREINSTALL += "raspberrypi-bootloader \
-                     raspberrypi-sys-mods \
+IMAGE_PREINSTALL += "raspberrypi-sys-mods \
                      raspi-config \
                      systemd-sysv \
                      udev"
 
+IMAGE_PREINSTALL:bullseye += "raspberrypi-bootloader"
+IMAGE_PREINSTALL:bookworm += "raspberrypi-bootloader"
+IMAGE_PREINSTALL:trixie += "raspi-firmware"
+
 IMAGE_INSTALL += "bootconfig-${MACHINE}"
 
 IMAGER_INSTALL:wic += "parted \
                        dosfstools \
                        mtools \
                        e2fsprogs \
-                       python3-distutils \
                        bmap-tools"
 
+IMAGER_INSTALL:bullseye:wic += "python3-distutils"
+IMAGER_INSTALL:bookworm:wic += "python3-distutils"
+IMAGER_INSTALL:trixie:wic += "python3-setuptools"
+
 IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
                      ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
+
+IMAGE_BOOT_FILES:trixie ?= "${IMAGE_ROOTFS}/boot/cmdline.txt;./ \
+                            ${IMAGE_ROOTFS}/boot/config.txt;./ \
+                            ${IMAGE_ROOTFS}/boot/firmware/*.*;./ \
+                            ${IMAGE_ROOTFS}/boot/firmware/overlays/*;overlays/"
+
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 72ebceaf..9d2cd652 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -62,12 +62,16 @@  BBMULTICONFIG = " \
     x86-pc-bookworm \
     rpi-arm-bullseye \
     rpi-arm-bookworm \
+    rpi-arm-trixie \
     rpi-arm-v7-bullseye \
     rpi-arm-v7-bookworm \
+    rpi-arm-v7-trixie \
     rpi-arm-v7l-bullseye \
     rpi-arm-v7l-bookworm \
+    rpi-arm-v7l-trixie \
     rpi-arm64-v8-bullseye \
     rpi-arm64-v8-bookworm \
+    rpi-arm64-v8-trixie \
     rpi-arm64-v8-efi-bookworm \
     sifive-fu540-trixie \
     starfive-visionfive2-trixie \
diff --git a/meta-isar/conf/multiconfig/rpi-arm-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-trixie.conf
new file mode 100644
index 00000000..ca744eac
--- /dev/null
+++ b/meta-isar/conf/multiconfig/rpi-arm-trixie.conf
@@ -0,0 +1,8 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+MACHINE ?= "rpi-arm"
+DISTRO ?= "raspios-trixie"
+
+KERNEL_IMAGE_PKG = "linux-image-rpi-v6"
+KERNEL_HEADERS_PKG = "linux-headers-rpi-v6"
diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf
new file mode 100644
index 00000000..e10b4237
--- /dev/null
+++ b/meta-isar/conf/multiconfig/rpi-arm-v7-trixie.conf
@@ -0,0 +1,8 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+MACHINE ?= "rpi-arm-v7"
+DISTRO ?= "raspios-trixie"
+
+KERNEL_IMAGE_PKG = "linux-image-rpi-v7"
+KERNEL_HEADERS_PKG = "linux-headers-rpi-v7"
diff --git a/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf
new file mode 100644
index 00000000..6c9f0131
--- /dev/null
+++ b/meta-isar/conf/multiconfig/rpi-arm-v7l-trixie.conf
@@ -0,0 +1,8 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+MACHINE ?= "rpi-arm-v7l"
+DISTRO ?= "raspios-trixie"
+
+KERNEL_IMAGE_PKG = "linux-image-rpi-v7"
+KERNEL_HEADERS_PKG = "linux-headers-rpi-v7"
diff --git a/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf b/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf
new file mode 100644
index 00000000..77a4c31e
--- /dev/null
+++ b/meta-isar/conf/multiconfig/rpi-arm64-v8-trixie.conf
@@ -0,0 +1,8 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+
+MACHINE ?= "rpi-arm64-v8"
+DISTRO ?= "raspios-trixie"
+
+KERNEL_IMAGE_PKG = "linux-image-rpi-v8"
+KERNEL_HEADERS_PKG = "linux-headers-rpi-v8"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 1facc8c2..6731b359 100644
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -1191,9 +1191,13 @@  class NoCrossTest(CIBaseTest):
     def test_nocross_rpi(self):
         targets = [
             'mc:rpi-arm-bullseye:isar-image-base',
+            'mc:rpi-arm-trixie:isar-image-base',
             'mc:rpi-arm-v7-bullseye:isar-image-base',
+            'mc:rpi-arm-v7-trixie:isar-image-base',
             'mc:rpi-arm-v7l-bullseye:isar-image-base',
+            'mc:rpi-arm-v7l-trixie:isar-image-base',
             'mc:rpi-arm64-v8-bullseye:isar-image-base',
+            'mc:rpi-arm64-v8-trixie:isar-image-base',
         ]
 
         self.init()
diff --git a/testsuite/data/targets.yml b/testsuite/data/targets.yml
index 64380620..2e5fa120 100644
--- a/testsuite/data/targets.yml
+++ b/testsuite/data/targets.yml
@@ -107,18 +107,26 @@  a: !mux
     name: rpi-arm-bullseye
   rpi-arm-bookworm:
     name: rpi-arm-bookworm
+  rpi-arm-trixie:
+    name: rpi-arm-trixie
   rpi-arm-v7-bullseye:
     name: rpi-arm-v7-bullseye
   rpi-arm-v7-bookworm:
     name: rpi-arm-v7-bookworm
+  rpi-arm-v7-trixie:
+    name: rpi-arm-v7-trixie
   rpi-arm-v7l-bullseye:
     name: rpi-arm-v7l-bullseye
   rpi-arm-v7l-bookworm:
     name: rpi-arm-v7l-bookworm
+  rpi-arm-v7l-trixie:
+    name: rpi-arm-v7l-trixie
   rpi-arm64-v8-bullseye:
     name: rpi-arm64-v8-bullseye
   rpi-arm64-v8-bookworm:
     name: rpi-arm64-v8-bookworm
+  rpi-arm64-v8-trixie:
+    name: rpi-arm64-v8-trixie
   rpi-arm64-v8-efi-bookworm:
     name: rpi-arm64-v8-efi-bookworm
   sifive-fu540-trixie: