From 30990b4c2e60f95f6290c707b49b41dea75d98d2 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 12 May 2025 17:18:38 +0200 Subject: [PATCH] ccmp15: manually add "optee" to MACHINE_FEATURES STM's st-machine-common-stm32mp.inc file automatically incorporates "optee" to MACHINE_FEATURES as long as BOOTSCHEME_LABELS contains "optee". Since we recently modified the ccmp15's labels to only contain "opteemin", this is no longer the case, which leads to: * optee packages (optee-client, optee-os) not getting installed in images and SDKs * optee patches for environment encryption not being applied to libubootenv Add the feature manually to fix these two issues Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 6e20355d8..072beb818 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -80,6 +80,9 @@ BOOTSCHEME_DEFAULT ?= "opteemin" MACHINE_FEATURES += "bluetooth" MACHINE_FEATURES += "wifi" MACHINE_FEATURES += "gpu" +# When BOOTSCHEME_LABELS is set to "opteemin", optee doesn't get automatically +# added to MACHINE_FEATURES. Add it manually +MACHINE_FEATURES += "optee" # ========================================================================= # Firmware