From fdddf79bd9f585906a6006fc29faa689af48fe79 Mon Sep 17 00:00:00 2001 From: Ayoub Zaki Date: Fri, 5 Jun 2026 22:47:29 +0200 Subject: [PATCH 1/2] linux-raspberrypi: switch to Linux 6.18 Switch the default linux-raspberrypi to 6.18. Pin raspberrypi-armv7 to 6.12 for both linux-raspberrypi and linux-raspberrypi-v7, since bcm2711_defconfig was dropped from arch/arm/configs/ in 6.18 and 32-bit builds fail do_kernel_metadata. arm64 machines stay on 6.18. Signed-off-by: Ayoub Zaki Signed-off-by: Khem Raj --- conf/machine/include/rpi-default-versions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc index 8e3e9be64..e274880d2 100644 --- a/conf/machine/include/rpi-default-versions.inc +++ b/conf/machine/include/rpi-default-versions.inc @@ -1,4 +1,5 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "6.12.%" -PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}" +PREFERRED_VERSION_linux-raspberrypi ??= "6.18.%" +PREFERRED_VERSION_linux-raspberrypi:raspberrypi-armv7 ??= "6.12.%" +PREFERRED_VERSION_linux-raspberrypi-v7 ??= "6.12.%" From c62550a1150788e2c6048268d7314fc8709e67fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Jul 2026 12:48:21 -0700 Subject: [PATCH 2/2] raspberrypi4: Pin to using 6.12 kernel Signed-off-by: Khem Raj --- conf/machine/raspberrypi4.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf index 86c57ed4a..9876b598e 100644 --- a/conf/machine/raspberrypi4.conf +++ b/conf/machine/raspberrypi4.conf @@ -6,6 +6,12 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc +# 6.18 has removed 32bit config for rpi4 and expects it +# to always use 64bit kernel even if rootfs is needed to be +# 32bit. So we need multiconfig builds, and technically, 32bit +# option for rpi4 should be gone +PREFERRED_VERSION_linux-raspberrypi ?= "6.12.%" + MACHINE_FEATURES += "pci" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43455 \