From 7fdd34516cc55f3072bec403cce8135fea74f74e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 18 Dec 2020 17:34:21 +0000 Subject: [PATCH] arm-bsp/musca: remove trusted-firmware-m statements Musca doesn't build 'images' in the traditional sense yet, just trusted-firmware-m or Zephyr, so remove EXTRA_IMAGEDEPENDS. Remove the preferred version for TF-M as we only ship one currently. Change-Id: I2fbd1230f6ba7a49aa093ca90fc38e676ba14633 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/musca-b1.conf | 3 --- meta-arm-bsp/conf/machine/musca-s1.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf index 5b359bc5..ac0bea0d 100644 --- a/meta-arm-bsp/conf/machine/musca-b1.conf +++ b/meta-arm-bsp/conf/machine/musca-b1.conf @@ -4,9 +4,6 @@ #@NAME: Musca-B1 machine #@DESCRIPTION: Machine configuration for Musca-B1 -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" -PREFERRED_VERSION_trusted-firmware-m = "1.0" - DEFAULTTUNE ?= "armv8m-main" require conf/machine/include/tune-cortexm33.inc diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf index 66e0a35c..2dcdb504 100644 --- a/meta-arm-bsp/conf/machine/musca-s1.conf +++ b/meta-arm-bsp/conf/machine/musca-s1.conf @@ -4,9 +4,6 @@ #@NAME: Musca-S1 machine #@DESCRIPTION: Machine configuration for Musca-S1 -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" -PREFERRED_VERSION_trusted-firmware-m = "1.0" - require conf/machine/include/tune-cortexm33.inc # GLIBC will not work with Cortex-M.