From 3b924302d6232813e28d41ee044a2504adf7b14f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 29 Sep 2020 21:08:44 -0400 Subject: [PATCH] arm-bsp: remove armv8m Musca B1 and S1 should be using the external tune files. Remove armv8, as it is not correct anyway, and use the Cortex-M33 tune. Note: This change will prevent glibc from compiling (and possibly others). This isn't relevant for a Cortex-M, as it should be running an RTOS not Linux. Change-Id: Id88d2af41217e8b5bad01e98b337cf0523acf6e1 Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/armv8m.inc | 12 ------------ meta-arm-bsp/conf/machine/musca-b1.conf | 6 ++++-- meta-arm-bsp/conf/machine/musca-s1.conf | 6 ++++-- 3 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 meta-arm-bsp/conf/machine/armv8m.inc diff --git a/meta-arm-bsp/conf/machine/armv8m.inc b/meta-arm-bsp/conf/machine/armv8m.inc deleted file mode 100644 index 07631938..00000000 --- a/meta-arm-bsp/conf/machine/armv8m.inc +++ /dev/null @@ -1,12 +0,0 @@ -DEFAULTTUNE ?= "armv8m" - -TUNEVALID[armv8m] = "Enable instructions for ARMv8-m" -AVAILTUNES += "armv8m" - -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" - -ARMPKGARCH_tune-armv8m ?= "armv8m" -TUNE_FEATURES_tune-armv8m = "armv8m" -PACKAGE_EXTRA_ARCHS_tune-armv8m = "armv8m" - -require conf/machine/include/arm/arch-arm.inc diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf index 0f9734b8..3ff3acf3 100644 --- a/meta-arm-bsp/conf/machine/musca-b1.conf +++ b/meta-arm-bsp/conf/machine/musca-b1.conf @@ -5,7 +5,9 @@ #@DESCRIPTION: Machine configuration for Musca-B1 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" - PREFERRED_VERSION_trusted-firmware-m = "1.0" -require armv8m.inc +require conf/machine/include/tune-cortexm33.inc + +# GLIBC will not work with Cortex-M. +TCLIBC = "baremetal" diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf index 4b6b575d..d2e5ab7d 100644 --- a/meta-arm-bsp/conf/machine/musca-s1.conf +++ b/meta-arm-bsp/conf/machine/musca-s1.conf @@ -5,7 +5,9 @@ #@DESCRIPTION: Machine configuration for Musca-S1 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" - PREFERRED_VERSION_trusted-firmware-m = "1.0" -require armv8m.inc +require conf/machine/include/tune-cortexm33.inc + +# GLIBC will not work with Cortex-M. +TCLIBC = "baremetal"