From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Martin Jansa <martin.jansa@gmail.com>
Subject: Re: [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS
Date: Tue, 17 Jul 2012 08:09:20 -0700 [thread overview]
Message-ID: <50058020.1000306@linux.intel.com> (raw)
In-Reply-To: <1341649914-18419-1-git-send-email-Martin.Jansa@gmail.com>
On 07/07/2012 01:31 AM, Martin Jansa wrote:
> * it wasn't consistent with other machine configs
> * reported 2 months ago..
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022154.html
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/conf/machine/include/arm/arch-armv5.inc | 2 +-
> meta/conf/machine/include/arm/arch-armv6.inc | 2 +-
> meta/conf/machine/include/arm/arch-armv7a.inc | 2 +-
> .../machine/include/powerpc/arch-powerpc64.inc | 2 +-
> meta/conf/machine/include/tune-mips32.inc | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
> diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
> index 4a75530..98780e5 100644
> --- a/meta/conf/machine/include/arm/arch-armv5.inc
> +++ b/meta/conf/machine/include/arm/arch-armv5.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
> ARMPKGARCH ?= "armv5"
>
> TUNEVALID[armv5] = "Enable instructions for ARMv5"
> -TUNE_CONFLICTS[armv5] = "armv4"
> +TUNECONFLICTS[armv5] = "armv4"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
> index da8274e..f0fee93 100644
> --- a/meta/conf/machine/include/arm/arch-armv6.inc
> +++ b/meta/conf/machine/include/arm/arch-armv6.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
> ARMPKGARCH ?= "armv6"
>
> TUNEVALID[armv6] = "Enable instructions for ARMv6"
> -TUNE_CONFLICTS[armv6] = "armv4 armv5"
> +TUNECONFLICTS[armv6] = "armv4 armv5"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index c90aff5..f439de7 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
> ARMPKGARCH ?= "armv7a"
>
> TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
> -TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
> +TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
> MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index a5e9755..f9e2b2a 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64"
> require conf/machine/include/powerpc/arch-powerpc.inc
>
> TUNEVALID[m64] = "Power ELF64 standard ABI"
> -TUNE_CONFLICTS[m64] = "m32 nf"
> +TUNECONFLICTS[m64] = "m32 nf"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
>
> diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
> index 93ed5ee..03cd411 100644
> --- a/meta/conf/machine/include/tune-mips32.inc
> +++ b/meta/conf/machine/include/tune-mips32.inc
> @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32"
> require conf/machine/include/mips/arch-mips.inc
>
> TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
> -TUNE_CONFLICTS[mips32] = "n64 n32"
> +TUNECONFLICTS[mips32] = "n64 n32"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
>
> AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"
>
next prev parent reply other threads:[~2012-07-17 15:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 18:02 CONFLICTS as keyword or just misspelled RCONFLICTS? Martin Jansa
2012-05-08 19:20 ` Mark Hatle
2012-05-08 19:25 ` Peter Seebach
2012-06-16 6:51 ` Martin Jansa
2012-07-07 8:31 ` [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Martin Jansa
2012-07-17 15:09 ` Saul Wold [this message]
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
2012-06-16 18:08 ` [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ Martin Jansa
2012-06-18 12:42 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Richard Purdie
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=50058020.1000306@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.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