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

ccmp1x: create new variable to be able to truly override TF_A_CONFIG 

Commit 7cf314ba80 made a weak assignment of TF_A_CONFIG in the machine
config file, so that it could be overriden from conf/local.conf with a
straight assignment. However, this variable already has a weak assignment
on include files for the tf-a-stm32mp recipe, which apparently take
precedence over the machine files.

This commit creates a new variable DEY_TF_A_CONFIG in the machine config,
and then uses a straight assignment of TF_A_CONFIG to the new variable on the
tf-a-stm32mp.bbappend.
This allows users to override the machine default and avoids the STM recipe
weak assignment.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2023-08-03 12:05:17 +02:00
parent 1fe98681ac
commit c6f19a099c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ ST_DEBUG_TRACE = "0"
# trusted-firmware-a # trusted-firmware-a
# ========================================================================= # =========================================================================
# Configure trusted-firmware-a build # Configure trusted-firmware-a build
TF_A_CONFIG ?= "optee nand" DEY_TF_A_CONFIG ?= "optee nand"
# ========================================================================= # =========================================================================
# optee # optee

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

@ -104,7 +104,7 @@ ST_DEBUG_TRACE = "0"
# trusted-firmware-a # trusted-firmware-a
# ========================================================================= # =========================================================================
# Configure trusted-firmware-a build # Configure trusted-firmware-a build
TF_A_CONFIG ?= "optee nand" DEY_TF_A_CONFIG ?= "optee nand"
# ========================================================================= # =========================================================================
# optee # optee

1
meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
View File

@ -14,6 +14,7 @@ SRC_URI = " \
${TFA_GIT_URI};branch=${SRCBRANCH} \ ${TFA_GIT_URI};branch=${SRCBRANCH} \
" "
TF_A_CONFIG = "${DEY_TF_A_CONFIG}"
TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1"
DEPENDS += " \ DEPENDS += " \