Update the machines using cortex m4s to use the OE tune file, and remove the duplicate one locally.
Signed-off-by: Jon Mason <[email protected]> --- .../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 diff --git a/meta-zephyr-bsp/conf/machine/include/nrf52.inc b/meta-zephyr-bsp/conf/machine/include/nrf52.inc index 4162d3e..bd72195 100644 --- a/meta-zephyr-bsp/conf/machine/include/nrf52.inc +++ b/meta-zephyr-bsp/conf/machine/include/nrf52.inc @@ -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" diff --git a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc index 0d46620..94b2e05 100644 --- a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc +++ b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc @@ -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" diff --git a/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc deleted file mode 100644 index b3092d8..0000000 --- a/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc +++ /dev/null @@ -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" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#58101): https://lists.yoctoproject.org/g/yocto/message/58101 Mute This Topic: https://lists.yoctoproject.org/mt/93811918/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
