summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-11-28 21:34:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:47:57 +0000
commitf06a11b55fcab26106294feb176d8ddd5f309fc4 (patch)
tree0a1a773f81b02bc5660d918cd41fd76f3284226c /meta
parentb7a7e6eebac711642944295ad62c996d6a75891c (diff)
downloadpoky-f06a11b55fcab26106294feb176d8ddd5f309fc4.tar.gz
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 (From OE-Core rev: 007a0dec82a33b01541c7f6fcad5d28c47a318ba) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc10
-rw-r--r--meta/conf/machine/include/tune-cortexa9.inc10
-rw-r--r--meta/conf/machine/include/tune-xscale.inc2
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
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon" 9AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon"
10ARMPKGARCH_tune-cortexa8 = "cortexa8" 10ARMPKGARCH_tune-cortexa8 = "cortexa8"
11ARMPKGARCH_tune-cortexa8t = "cortexa8t" 11ARMPKGARCH_tune-cortexa8t = "cortexa8"
12ARMPKGARCH_tune-cortexa8-neon = "cortexa8-neon" 12ARMPKGARCH_tune-cortexa8-neon = "cortexa8"
13TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8" 13TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8"
14TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8" 14TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8"
15TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8" 15TUNE_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
19 19
20# VFP Tunes 20# VFP Tunes
21AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon" 21AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon"
22ARMPKGARCH_tune-cortexa8hf = "cortexa8hf" 22ARMPKGARCH_tune-cortexa8hf = "cortexa8"
23ARMPKGARCH_tune-cortexa8thf = "cortexa8thf" 23ARMPKGARCH_tune-cortexa8thf = "cortexa8"
24ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8hf-neon" 24ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8"
25TUNE_FEATURES_tune-cortexa8hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa8" 25TUNE_FEATURES_tune-cortexa8hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa8"
26TUNE_FEATURES_tune-cortexa8thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa8" 26TUNE_FEATURES_tune-cortexa8thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa8"
27TUNE_FEATURES_tune-cortexa8hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa8" 27TUNE_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
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon" 9AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon"
10ARMPKGARCH_tune-cortexa9 = "cortexa9" 10ARMPKGARCH_tune-cortexa9 = "cortexa9"
11ARMPKGARCH_tune-cortexa9t = "cortexa9t" 11ARMPKGARCH_tune-cortexa9t = "cortexa9"
12ARMPKGARCH_tune-cortexa9-neon = "cortexa9-neon" 12ARMPKGARCH_tune-cortexa9-neon = "cortexa9"
13TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9" 13TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9"
14TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9" 14TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9"
15TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9" 15TUNE_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
19 19
20# VFP Tunes 20# VFP Tunes
21AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon" 21AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon"
22ARMPKGARCH_tune-cortexa9hf = "cortexa9hf" 22ARMPKGARCH_tune-cortexa9hf = "cortexa9"
23ARMPKGARCH_tune-cortexa9thf = "cortexa9thf" 23ARMPKGARCH_tune-cortexa9thf = "cortexa9"
24ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9hf-neon" 24ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9"
25TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9" 25TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9"
26TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9" 26TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9"
27TUNE_FEATURES_tune-cortexa9hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9" 27TUNE_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"
11PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}" 11PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}"
12 12
13AVAILTUNES += "xscale-be" 13AVAILTUNES += "xscale-be"
14ARMPKGARCH_tune-xscale-be = "xscale-be" 14ARMPKGARCH_tune-xscale-be = "xscale"
15TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-armv5teb} xscale bigendian" 15TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-armv5teb} xscale bigendian"
16PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}" 16PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}"
17 17