Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hector Palacios 2025-04-23 13:02:30 +02:00
parent e644965b0d
commit 51116d4065
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/ccmp13-dvk.conf
View File

@ -59,6 +59,9 @@ FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb"
# ========================================================================= # =========================================================================
# Map OPTEE configuration to device tree list # Map OPTEE configuration to device tree list
OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
# Supported boot schemes
BOOTSCHEME_LABELS ?= "optee"
# ========================================================================= # =========================================================================
# Machine features # Machine features

3
meta-digi-arm/conf/machine/ccmp15-dvk.conf
View File

@ -69,6 +69,9 @@ FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb"
# ========================================================================= # =========================================================================
# Map OPTEE configuration to device tree list # Map OPTEE configuration to device tree list
OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
OPTEE_DEVICETREE_opteemin = "${STM32MP_DEVICETREE}"
# Supported boot schemes
BOOTSCHEME_LABELS ?= "opteemin"
# ========================================================================= # =========================================================================
# Machine features # Machine features

2
meta-digi-arm/conf/machine/include/ccmp1.inc
View File

@ -77,8 +77,6 @@ IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'bo
# List of supported boot devices # List of supported boot devices
BOOTDEVICE_LABELS ?= "nand-4-256-1024 usb" 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 # Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc
# because image_types_digi.bbclass already builds their own. # because image_types_digi.bbclass already builds their own.