diff mbox series

[meta-zephyr,2/3] zephyr-bsp/qemu-cortex-m3: update to use new path

Message ID 20220920150146.7124-2-jon.mason@arm.com
State New
Headers show
Series [meta-zephyr,1/3] zephyr-bsp: remove unused tune file | expand

Commit Message

Jon Mason Sept. 20, 2022, 3:01 p.m. UTC 
Update the qemu-cortex-m3 machine to use the OE tune file, and remove
the duplicate one locally.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../conf/machine/include/tune-cortexm3.inc    | 21 -------------------
 .../conf/machine/qemu-cortex-m3.conf          |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
diff mbox series

Patch

diff --git a/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
deleted file mode 100644
index 404e2b7..0000000
--- a/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
+++ /dev/null
@@ -1,21 +0,0 @@ 
-DEFAULTTUNE ?= "cortexm3"
-
-require conf/machine/include/arm/arch-armv7a.inc
-
-TUNEVALID[cortexm3] = "Enable Cortex-M3 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm3', ' -mcpu=cortex-m3', '', d)}"
-AVAILTUNES += "cortexm3"
-
-TUNEVALID[armv7m] = "Enable Cortex-M3 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7-m', '', d)}"
-MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}"
-
-TUNE_PKGARCH:tune-cortexm3 = "cortexm3"
-
-ARMPKGARCH:tune-cortexm3 = "armv7m"
-PACKAGE_EXTRA_ARCHS:tune-cortexm3 ="cortexm3"
-
-TUNE_FEATURES:tune-cortexm3 = "armv7m vfp cortexm3"
-PACKAGE_EXTRA_ARCHS:tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp"
-
-TUNE_CCARGS_MFLOAT = "soft"
diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
index 835a775..989f2ca 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
@@ -3,7 +3,7 @@ 
 #@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_m3
 
 require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortexm3.inc
+require conf/machine/include/arm/armv7m/tune-cortexm3.inc
 
 ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"