From d9a0f4fe592e10adf529040d4ccf77b19ded3741 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 18 Dec 2020 17:34:23 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-m: move TFM_PLATFORM to machine configuration Now this can be easily set in the machine, do so. Change-Id: I964c78c8e1e8f845cc2c95193c4a795e12089d1a Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/musca-b1.conf | 2 ++ meta-arm-bsp/conf/machine/musca-s1.conf | 2 ++ .../trusted-firmware-m/trusted-firmware-m_%.bbappend | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf index ac0bea0d..5300b754 100644 --- a/meta-arm-bsp/conf/machine/musca-b1.conf +++ b/meta-arm-bsp/conf/machine/musca-b1.conf @@ -23,3 +23,5 @@ QB_MEM = "512k" ZEPHYR_BOARD = "v2m_musca_b1" ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" ARCH_musca-b1 = "arm" + +TFM_PLATFORM = "MUSCA_B1" diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf index 2dcdb504..c4131a82 100644 --- a/meta-arm-bsp/conf/machine/musca-s1.conf +++ b/meta-arm-bsp/conf/machine/musca-s1.conf @@ -8,3 +8,5 @@ require conf/machine/include/tune-cortexm33.inc # GLIBC will not work with Cortex-M. TCLIBC = "newlib" + +TFM_PLATFORM = "MUSCA_S1" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend deleted file mode 100644 index d7a099e0..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -COMPATIBLE_MACHINE = "musca-b1|musca-s1" - -TFM_PLATFORM_musca-b1 = "MUSCA_B1" -TFM_PLATFORM_musca-s1 = "MUSCA_S1"