From 8ee168de0a1da6aaabfd29b686521601aaddd77a Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 13 Oct 2025 10:41:28 +0200 Subject: [PATCH] ccmp1/ccmp2: adapt virtual optee syntax This commit updates the virtual OP-TEE syntax for the CCMP1 and CCMP2 platforms to align with the changes introduced in the meta-st-stm32mp layer. Specifically, it mirrors the update made in commit ded46c7d24addf91ec81c9f64309e6376689977a ("Adapt to virtual optee changes"). Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/include/ccmp1.inc | 2 +- meta-digi-arm/conf/machine/include/ccmp2.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 896f1d013..05c75ca49 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -104,7 +104,7 @@ IMAGE_FSTYPES:remove = "multiubi" WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ virtual/trusted-firmware-a \ - ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual/optee-os', '', d)} \ + ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual-optee-os', '', d)} \ " # Disable the generation of flashlayout files diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc index 2b3a582db..e69eaee54 100644 --- a/meta-digi-arm/conf/machine/include/ccmp2.inc +++ b/meta-digi-arm/conf/machine/include/ccmp2.inc @@ -44,7 +44,7 @@ TF_A_METADATA_TOOL_ARGS ?= "-g -i 1 -b 2 -v ${TF_A_METADATA_TOOL_VERSION} ${DEVI # ========================================================================= # optee-os # ========================================================================= -PREFERRED_PROVIDER_virtual/optee-os = "optee-os-stm32mp" +PREFERRED_PROVIDER_virtual-optee-os = "optee-os-stm32mp" # OPTEE runtime packages to install OPTEE_PKGS ??= "optee-client" @@ -122,7 +122,7 @@ ST_OPTEE_DEBUG_LOG_LEVEL = "1" WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ virtual/trusted-firmware-a \ - ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual/optee-os', '', d)} \ + ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual-optee-os', '', d)} \ " # Disable the generation of flashlayout files