From a6211b606763255020e11bb7d838e3de647b3048 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Wed, 21 Dec 2022 14:39:42 +0000 Subject: [PATCH] arm/qemuarm-secureboot: pin optee-os version There is a new optee version 3.19. Currently, qemuarm-secureboot cannot boot optee 3.19 out-of-the-box. This pins optee-os version to 3.18 for qemuarm-secureboot. Signed-off-by: Emekcan Aras Signed-off-by: Jon Mason --- meta-arm/conf/machine/qemuarm-secureboot.conf | 3 +++ meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/conf/machine/qemuarm-secureboot.conf index f08b84fe..db02dc68 100644 --- a/meta-arm/conf/machine/qemuarm-secureboot.conf +++ b/meta-arm/conf/machine/qemuarm-secureboot.conf @@ -21,3 +21,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" + +PREFERRED_VERSION_optee-os ?= "3.18.%" + diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf index 55c4cab4..7277817d 100644 --- a/meta-arm/conf/machine/qemuarm64-secureboot.conf +++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf @@ -23,3 +23,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" + +PREFERRED_VERSION_optee-os ?= "3.18.%" +