From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH
Date: Mon, 01 Aug 2011 10:06:27 +0100 [thread overview]
Message-ID: <1312189587.2344.427.camel@rex> (raw)
In-Reply-To: <f2fee70727d940b61a8470d13c22a3313d9ee3ae.1312182844.git.sgw@linux.intel.com>
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> Based on Kumar Gala <galak@kernel.crashing.org>'s patch.
>
> By default we use ppc, or ppc64. Each tune either specifies their
> manual version or can use the PPC_PKGARCH to specify a new prefix
> if they support both float and no-float variants.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/conf/machine/include/powerpc/arch-powerpc.inc | 3 ++-
> .../machine/include/powerpc/arch-powerpc64.inc | 1 +
> meta/conf/machine/include/tune-ppc603e.inc | 4 ++--
> meta/conf/machine/include/tune-ppce300c2.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500mc.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500v2.inc | 5 +++--
> 7 files changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> index 013755d..2621932 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> @@ -8,6 +8,7 @@ DEFAULTTUNE ?= "powerpc"
> TUNEVALID[m32] = "Power ELF32 standard ABI"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
> +PPC_PKGARCH = "ppc"
>
> TUNEVALID[fpu-hard] = "Use hardware FPU."
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"
> @@ -20,7 +21,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
>
> PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>
> -TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
> +TUNE_PKGARCH ?= "${PPC_PKGARCH}${PPCPKGSFX_FPU}"
>
> # Basic tune definitions
> AVAILTUNES += "powerpc powerpc-nf"
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index a965d59..0a104a2 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -2,6 +2,7 @@ TUNEVALID[m64] = "Power ELF64 standard ABI"
> TUNE_CONFLICTS[m64] = "m32 nf"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
> +PPC_PKGARCH = "ppc64"
>
> AVAILTUNES += "powerpc64"
> TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
> diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
> index 7c05394..2eec64b 100644
> --- a/meta/conf/machine/include/tune-ppc603e.inc
> +++ b/meta/conf/machine/include/tune-ppc603e.inc
> @@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
>
> TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
> -TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "ppc603e", "", d)}"
> +PPC_PKGARCH_tune-ppc603e = "ppc603e"
I was going to ask how this is meant to work without overrides, then I
saw the later patch (which are queued in the wrong order). I suspect you
need to use syntax like:
PPC_PKGARCH ??= "${@d.getvar(bb.data.expand("PPC_PKGARCH_tune-${DEFAULTTUNE}"), True) or d.getvar("PPC_PKGARCH", True)}"
above and then this will work without overrides.
Cheers,
Richard
next prev parent reply other threads:[~2011-08-01 9:11 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
2011-08-01 7:35 ` [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS Saul Wold
2011-08-01 7:35 ` [PATCH 02/22] glibc: deleted Saul Wold
2011-08-01 7:35 ` [PATCH 03/22] libzypp: Fix variable substitution problem in do_archgen step Saul Wold
2011-08-01 7:35 ` [PATCH 04/22] docbook-sgml-dtd-native: Write a bak file for shared state Saul Wold
2011-08-01 7:35 ` [PATCH 05/22] docbook-dsssl-stylesheets-native: " Saul Wold
2011-08-01 7:35 ` [PATCH 06/22] openjade-native: " Saul Wold
2011-08-01 7:35 ` [PATCH 07/22] sgml-common-native: Read a catalog backup to repopulate sgml-docbook.cat Saul Wold
2011-08-01 7:36 ` [PATCH 08/22] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling Saul Wold
2011-08-01 7:36 ` [PATCH 09/22] tune/arch-powerpc64: Remove support for soft-float from ppc64 Saul Wold
2011-08-01 7:36 ` [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 14:13 ` Kumar Gala
2011-08-01 14:50 ` Mark Hatle
2011-08-01 15:57 ` Kumar Gala
2011-08-02 18:31 ` Kumar Gala
2011-08-02 22:36 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 11/22] tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard fpu Saul Wold
2011-08-01 7:36 ` [PATCH 12/22] sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS Saul Wold
2011-08-01 7:36 ` [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 13:28 ` Koen Kooi
2011-08-01 14:11 ` Kumar Gala
2011-08-01 17:34 ` Khem Raj
2011-08-01 18:51 ` Kumar Gala
2011-08-01 18:59 ` Khem Raj
2011-08-02 13:39 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 14/22] libzypp: Bump PR Saul Wold
2011-08-01 7:36 ` [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH Saul Wold
2011-08-01 9:06 ` Richard Purdie [this message]
2011-08-01 7:36 ` [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages Saul Wold
2011-08-01 13:06 ` Richard Purdie
2011-08-01 14:47 ` Mark Hatle
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
2011-08-01 9:00 ` Richard Purdie
2011-08-01 9:09 ` Phil Blundell
2011-08-01 14:36 ` Mark Hatle
2011-08-01 7:36 ` [PATCH 18/22] rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE Saul Wold
2011-08-01 7:36 ` [PATCH 19/22] package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo Saul Wold
2011-08-01 7:36 ` [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case Saul Wold
2011-08-01 13:10 ` Richard Purdie
2011-08-01 13:35 ` Koen Kooi
2011-08-01 7:36 ` [PATCH 21/22] external-*toolchain: remove glibc-utils provide Saul Wold
2011-08-01 13:11 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode Saul Wold
2011-08-01 13:14 ` Richard Purdie
2011-08-01 17:46 ` Khem Raj
2011-08-05 10:59 ` Phil Blundell
2011-08-05 11:39 ` Richard Purdie
2011-08-05 14:34 ` Phil Blundell
2011-08-05 15:23 ` Khem Raj
2011-08-05 16:23 ` Richard Purdie
2011-08-01 13:20 ` [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 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=1312189587.2344.427.camel@rex \
--to=richard.purdie@linuxfoundation.org \
--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