@@ -3,9 +3,9 @@
#@DESCRIPTION: Machine configuration for Nordic Semiconductor nRF52xxx (Cortex-M4) SoC.
-require conf/machine/include/tune-cortexm4.inc
+require conf/machine/include/arm/armv7m/tune-cortexm4.inc
-TUNE_FEATURES = "armv7m cortexm4"
+TUNE_FEATURES = "armv7em cortexm4"
# Target type for this machine used by Pyocd
PYOCD_TARGET = "nrf52"
@@ -3,6 +3,6 @@
#@DESCRIPTION: Machine configuration for Cortex-M4 core of STMicroelectronics STM32MP1 SoC.
-require conf/machine/include/tune-cortexm4.inc
+require conf/machine/include/arm/armv7m/tune-cortexm4.inc
-TUNE_FEATURES = "armv7m cortexm4"
+TUNE_FEATURES = "armv7em cortexm4"
deleted file mode 100644
@@ -1,19 +0,0 @@
-DEFAULTTUNE ?= "cortexm4"
-
-require conf/machine/include/arm/arch-armv7a.inc
-
-TUNEVALID[cortexm4] = "Enable Cortex-M4 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm4', ' -mcpu=cortex-m4', '', d)}"
-AVAILTUNES += "cortexm4"
-
-TUNEVALID[armv7m] = "Enable Cortex-M4 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7e-m', '', d)}"
-MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}"
-
-TUNE_PKGARCH:tune-cortexm4 = "cortexm4"
-
-ARMPKGARCH:tune-cortexm4 = "armv7m"
-PACKAGE_EXTRA_ARCHS:tune-cortexm4 ="cortexm4"
-
-TUNE_FEATURES:tune-cortexm4 = "armv7m vfp cortexm4"
-PACKAGE_EXTRA_ARCHS:tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp armv7m"
Update the machines using cortex m4s to use the OE tune file, and remove the duplicate one locally. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../conf/machine/include/nrf52.inc | 4 ++-- .../machine/include/stm32mp1-cortex-m4.inc | 4 ++-- .../conf/machine/include/tune-cortexm4.inc | 19 ------------------- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc