From e89385894dceabcf947c8e17b864b7502e4d4de4 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 7 Sep 2023 08:56:35 +0200 Subject: [PATCH] Revert "ccmp1x: create new variable to be able to truly override TF_A_CONFIG" We will use BOOTDEVICE_LABELS as a means to add 'sdcard' configuration to TF_A_CONFIG within meta-st-stm32 so there is no need to have a wrapper variable in meta-digi. This reverts commit c6f19a099c0b46e7bc52880915ab100406e2d8af. Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 +- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 4dd893eb1..25d17fd15 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -96,7 +96,7 @@ ST_DEBUG_TRACE = "0" # trusted-firmware-a # ========================================================================= # Configure trusted-firmware-a build -DEY_TF_A_CONFIG ?= "optee nand" +TF_A_CONFIG ?= "optee nand" # ========================================================================= # optee diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 55636af86..8fa32a2ae 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -104,7 +104,7 @@ ST_DEBUG_TRACE = "0" # trusted-firmware-a # ========================================================================= # Configure trusted-firmware-a build -DEY_TF_A_CONFIG ?= "optee nand" +TF_A_CONFIG ?= "optee nand" # ========================================================================= # optee diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index e70fb808a..31a8c57c4 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend @@ -14,7 +14,6 @@ SRC_URI = " \ ${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" DEPENDS += " \