Yocto Project Discussions
 help / color / mirror / Atom feed
From: Jon Mason <jon.mason@arm.com>
To: yocto@lists.yoctoproject.org
Subject: [meta-zephyr][PATCH 2/3] zephyr-bsp/qemu-cortex-m3: update to use new path
Date: Tue, 20 Sep 2022 11:01:45 -0400	[thread overview]
Message-ID: <20220920150146.7124-2-jon.mason@arm.com> (raw)
In-Reply-To: <20220920150146.7124-1-jon.mason@arm.com>

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 --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"
 
-- 
2.17.1



  reply	other threads:[~2022-09-20 19:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20 15:01 [meta-zephyr][PATCH 1/3] zephyr-bsp: remove unused tune file Jon Mason
2022-09-20 15:01 ` Jon Mason [this message]
2022-09-20 15:01 ` [meta-zephyr][PATCH 3/3] zephyr-bsp: update cortex-m4's to use new path Jon Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220920150146.7124-2-jon.mason@arm.com \
    --to=jon.mason@arm.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox