From 53d6606e6952bd0decc34cbc03226346e4a9ccb3 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 17 Dec 2025 21:52:14 +0100 Subject: [PATCH] ccmp1/ccmp2: set default OP-TEE board config for SDK generation Select the proper OP-TEE board configuration in the optee-os-stm32mp recipe so trusted applications are built/exported correctly in the SDK. Without this change, the build may choose a different MACHINE and trigger unexpected compilation issues. Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 ++ meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 ++ meta-digi-arm/conf/machine/ccmp25-dvk.conf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 280962ac9..8bd31d79e 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -69,6 +69,8 @@ OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}" # Supported boot schemes BOOTSCHEME_LABELS ?= "optee" BOOTSCHEME_DEFAULT ?= "optee" +# For sdk generation, declare the default board configuration to use. +ST_OPTEE_EXPORT_TA_REF_BOARD:stm32mp1common = "ccmp13-dvk-256MB.dts" # ========================================================================= # Machine features diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 0f89255be..a0ca37532 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -78,6 +78,8 @@ OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}" # Supported boot schemes BOOTSCHEME_LABELS ?= "optee" BOOTSCHEME_DEFAULT ?= "optee" +# For sdk generation, declare the default board configuration to use. +ST_OPTEE_EXPORT_TA_REF_BOARD:stm32mp1common = "ccmp15-dvk-512MB.dts" # ========================================================================= # Machine features diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index c3aa561af..5030ce62e 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -70,6 +70,8 @@ FIT_CONF_DEFAULT_DTB = "ccmp25-dvk.dtb" # ========================================================================= # Map OPTEE configuration to device tree list OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" +# For sdk generation, declare the default board configuration to use. +ST_OPTEE_EXPORT_TA_REF_BOARD:stm32mp2common = "ccmp25-dvk.dts" # ========================================================================= # Machine features