From 007a0dec82a33b01541c7f6fcad5d28c47a318ba Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 28 Nov 2012 21:34:59 +0000 Subject: tune-cortexa*, tune-xscale: fix ARMPKGARCH * hf/t/neon/b suffix is added by other ARMPKGSFX* variables, should not be part of ARMPKGARCH, otherwise resulting TUNE_PKGARCH have that suffix twice, e.g. cortexa8hf-neonhf-neon Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-cortexa8.inc | 10 +++++----- meta/conf/machine/include/tune-cortexa9.inc | 10 +++++----- meta/conf/machine/include/tune-xscale.inc | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc index 89878d4159..481bbae8d9 100644 --- a/meta/conf/machine/include/tune-cortexa8.inc +++ b/meta/conf/machine/include/tune-cortexa8.inc @@ -8,8 +8,8 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa8", "-mtune=cortex # Little Endian base configs AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon" ARMPKGARCH_tune-cortexa8 = "cortexa8" -ARMPKGARCH_tune-cortexa8t = "cortexa8t" -ARMPKGARCH_tune-cortexa8-neon = "cortexa8-neon" +ARMPKGARCH_tune-cortexa8t = "cortexa8" +ARMPKGARCH_tune-cortexa8-neon = "cortexa8" TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8" TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8" TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8" @@ -19,9 +19,9 @@ PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon # VFP Tunes AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon" -ARMPKGARCH_tune-cortexa8hf = "cortexa8hf" -ARMPKGARCH_tune-cortexa8thf = "cortexa8thf" -ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8hf-neon" +ARMPKGARCH_tune-cortexa8hf = "cortexa8" +ARMPKGARCH_tune-cortexa8thf = "cortexa8" +ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8" TUNE_FEATURES_tune-cortexa8hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa8" TUNE_FEATURES_tune-cortexa8thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa8" TUNE_FEATURES_tune-cortexa8hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa8" diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc index addfdad2d4..739e5aede9 100644 --- a/meta/conf/machine/include/tune-cortexa9.inc +++ b/meta/conf/machine/include/tune-cortexa9.inc @@ -8,8 +8,8 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex # Little Endian base configs AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon" ARMPKGARCH_tune-cortexa9 = "cortexa9" -ARMPKGARCH_tune-cortexa9t = "cortexa9t" -ARMPKGARCH_tune-cortexa9-neon = "cortexa9-neon" +ARMPKGARCH_tune-cortexa9t = "cortexa9" +ARMPKGARCH_tune-cortexa9-neon = "cortexa9" TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9" TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9" TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9" @@ -19,9 +19,9 @@ PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon # VFP Tunes AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon" -ARMPKGARCH_tune-cortexa9hf = "cortexa9hf" -ARMPKGARCH_tune-cortexa9thf = "cortexa9thf" -ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9hf-neon" +ARMPKGARCH_tune-cortexa9hf = "cortexa9" +ARMPKGARCH_tune-cortexa9thf = "cortexa9" +ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9" TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9" TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9" TUNE_FEATURES_tune-cortexa9hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9" diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index a48c2d9bfb..baa4291184 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -11,7 +11,7 @@ TUNE_FEATURES_tune-xscale = "${TUNE_FEATURES_tune-armv5te} xscale" PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}" AVAILTUNES += "xscale-be" -ARMPKGARCH_tune-xscale-be = "xscale-be" +ARMPKGARCH_tune-xscale-be = "xscale" TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-armv5teb} xscale bigendian" PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}" -- cgit v1.2.3