diff mbox series

[2/2] arm/arm-tstee: pin kernel to 6.6 to workaround issue

Message ID 20240820134317.3438-2-jon.mason@arm.com
State New
Headers show
Series [1/2] arm/qemu-efi-disk: add rootwait to bootargs | expand

Commit Message

Jon Mason Aug. 20, 2024, 1:43 p.m. UTC 
arm-tstee doesn't compile on 6.8 or newer kernels.  Temporarily pin the
kernels of machines using this package back to 6.6 while developing a
fix.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/fvp-base.conf         | 2 ++
 meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++
 2 files changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 353024e26b72..2fc49fc7bfe2 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -23,6 +23,8 @@  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KERNEL_DTB_NAME = "fvp-base-revc.dtb"
 KERNEL_DEVICETREE = "arm/${KERNEL_DTB_NAME}"
 KERNEL_IMAGETYPE = "Image"
+#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
 
diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
index 78a39c03c1bd..cfc6ff7706fb 100644
--- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
@@ -3,6 +3,9 @@  MACHINEOVERRIDES =. "qemuarm64:"
 require ${COREBASE}/meta/conf/machine/qemuarm64.conf
 
 KMACHINE = "qemuarm64"
+#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
+PREFERRED_VERSION_linux-yocto-rt ?= "6.6.%"
 
 # secure=on can't ever use KVM, so force it off
 QEMU_USE_KVM = ""