From 51116d4065ee128c69f94cf8a58aaca8fdab7dce Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 23 Apr 2025 13:02:30 +0200
Subject: [PATCH] ccmp1: use 'opteemin' BOOTSCHEME_LABELS for ccmp15 by default

Move BOOTSCHEME_LABELS from common include to platform config

Default to:
- 'opteemin' for ccmp15
- 'optee' for ccmp13

This doesn't change the behavior present in DEY-4.0, where OPTEE in ccmp15
was minimal and running on non-secure DDR.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccmp13-dvk.conf   | 3 +++
 meta-digi-arm/conf/machine/ccmp15-dvk.conf   | 3 +++
 meta-digi-arm/conf/machine/include/ccmp1.inc | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index f9db7e410..86bf5054a 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -59,6 +59,9 @@ FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb"
 # =========================================================================
 # Map OPTEE configuration to device tree list
 OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
+OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
+# Supported boot schemes
+BOOTSCHEME_LABELS ?= "optee"
 
 # =========================================================================
 # Machine features
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 330d3b52c..89890f290 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -69,6 +69,9 @@ FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb"
 # =========================================================================
 # Map OPTEE configuration to device tree list
 OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
+OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
+# Supported boot schemes
+BOOTSCHEME_LABELS ?= "opteemin"
 
 # =========================================================================
 # Machine features
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 33229990f..46d3a9d73 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -77,8 +77,6 @@ IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'bo
 
 # List of supported boot devices
 BOOTDEVICE_LABELS ?= "nand-4-256-1024 usb"
-# Supported boot schemes
-BOOTSCHEME_LABELS ?= "optee"
 
 # Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc
 # because image_types_digi.bbclass already builds their own.