From 1085b73dcca0029798e77a1b9e7419bc6edc47cc Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 7 Sep 2023 08:58:29 +0200 Subject: [PATCH] Revert "ccmp1: allow override of 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 7cf314ba80dd42aa1946beeaef3bfafe56be4484. Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 25d17fd15..7ecd6c0a1 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 -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 8fa32a2ae..64dd70af7 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 -TF_A_CONFIG ?= "optee nand" +TF_A_CONFIG = "optee nand" # ========================================================================= # optee