summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-11 17:05:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 10:01:22 +0000
commit2c300bccbdd7eb3572d0ecab0f10f291b290d359 (patch)
tree7e4b3bb0edaf894206c9541cdaf5baf359a32b1c
parentc5b670e4c9f020ed951d5499a888c50b1d703b62 (diff)
downloadpoky-2c300bccbdd7eb3572d0ecab0f10f291b290d359.tar.gz
arch-arm: define different ARMPKGARCH when different CCARGS are used
* without this tune-xscale and tune-arm926ejs were both creating packages in armv5te feed, but each with different -mtune, with OEBasicHash enabled it was causing each package to rebuild with new -mtune after MACHINE switch, but that doesn't make sense with output stored in the same armv5te feed * this makes different feed for each -mtune, but more generic one to be selected with DEFAULTTUNE * tune-iwmmxt and tune-ep9312 were already using this, just move it bellow AVAILTUNES and use ARMPKGARCH_tune-foo syntax * tune-cortexr4 and tune-cortexm3 are using armv7r/armv7m as ARMPKGARCH because there isn't another tune to use the same -march (From OE-Core rev: cffda9a821a3b83a8529d643c567859e091c6846) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc1
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc1
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc2
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc1
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc6
-rw-r--r--meta/conf/machine/include/tune-cortexa9.inc6
-rw-r--r--meta/conf/machine/include/tune-cortexm1.inc1
-rw-r--r--meta/conf/machine/include/tune-cortexm3.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexr4.inc2
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc4
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc4
-rw-r--r--meta/conf/machine/include/tune-strongarm1100.inc1
-rw-r--r--meta/conf/machine/include/tune-xscale.inc2
13 files changed, 24 insertions, 9 deletions
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index 4f4a2eba06..2efcedd040 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -6,5 +6,6 @@ TUNEVALID[arm1136jfs] = "Enable arm1136jfs specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1136jfs", "-mtune=arm1136jf-s", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1136jfs", "-mtune=arm1136jf-s", "", d)}"
7 7
8AVAILTUNES += "arm1136jfs" 8AVAILTUNES += "arm1136jfs"
9ARMPKGARCH_tune-arm1136jfs = "arm1136jfs"
9TUNE_FEATURES_tune-arm1136jfs = "${TUNE_FEATURES_tune-armv6} arm1136jfs" 10TUNE_FEATURES_tune-arm1136jfs = "${TUNE_FEATURES_tune-armv6} arm1136jfs"
10PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}" 11PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}"
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index b7584ab2da..459d978611 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -6,6 +6,7 @@ TUNEVALID[arm920t] = "Enable arm920t specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm920t", "-mtune=arm920t", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm920t", "-mtune=arm920t", "", d)}"
7 7
8AVAILTUNES += "arm920t" 8AVAILTUNES += "arm920t"
9ARMPKGARCH_tune-arm920t = "arm920t"
9TUNE_FEATURES_tune-arm920t = "${TUNE_FEATURES_tune-armv4t} arm920t" 10TUNE_FEATURES_tune-arm920t = "${TUNE_FEATURES_tune-armv4t} arm920t"
10PACKAGE_EXTRA_ARCHS_tune-arm920t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}" 11PACKAGE_EXTRA_ARCHS_tune-arm920t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}"
11 12
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index 7f2cc4e659..0cfeb7756f 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -6,6 +6,6 @@ TUNEVALID[arm926ejs] = "Enable arm926ejs specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm926ejs", "-mtune=arm926ej-s", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm926ejs", "-mtune=arm926ej-s", "", d)}"
7 7
8AVAILTUNES += "arm926ejs" 8AVAILTUNES += "arm926ejs"
9ARMPKGARCH_tune-arm926ejs = "arm926ejs"
9TUNE_FEATURES_tune-arm926ejs = "${TUNE_FEATURES_tune-armv5te} arm926ejs" 10TUNE_FEATURES_tune-arm926ejs = "${TUNE_FEATURES_tune-armv5te} arm926ejs"
10PACKAGE_EXTRA_ARCHS_tune-arm926ejs = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}" 11PACKAGE_EXTRA_ARCHS_tune-arm926ejs = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}"
11
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index 0dc5c26129..100242fb59 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -6,6 +6,7 @@ TUNEVALID[arm9tdmi] = "Enable arm9tdmi specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm9tdmi", "-mtune=arm9tdmi", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm9tdmi", "-mtune=arm9tdmi", "", d)}"
7 7
8AVAILTUNES += "arm9tdmi" 8AVAILTUNES += "arm9tdmi"
9ARMPKGARCH_tune-arm9tdmi = "arm9tdmi"
9TUNE_FEATURES_tune-arm9tdmi = "${TUNE_FEATURES_tune-armv4t} arm9tdmi" 10TUNE_FEATURES_tune-arm9tdmi = "${TUNE_FEATURES_tune-armv4t} arm9tdmi"
10PACKAGE_EXTRA_ARCHS_tune-arm9tdmi = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}" 11PACKAGE_EXTRA_ARCHS_tune-arm9tdmi = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}"
11 12
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index 9d79a58c5e..29fbe8971c 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -7,6 +7,9 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa8", "-mtune=cortex
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon" 9AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon"
10ARMPKGARCH_tune-cortexa8 = "cortexa8"
11ARMPKGARCH_tune-cortexa8t = "cortexa8t"
12ARMPKGARCH_tune-cortexa8-neon = "cortexa8-neon"
10TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8" 13TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8"
11TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8" 14TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8"
12TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8" 15TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8"
@@ -16,6 +19,9 @@ PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon
16 19
17# VFP Tunes 20# VFP Tunes
18AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon" 21AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon"
22ARMPKGARCH_tune-cortexa8hf = "cortexa8hf"
23ARMPKGARCH_tune-cortexa8thf = "cortexa8thf"
24ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8hf-neon"
19TUNE_FEATURES_tune-cortexa8hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa8" 25TUNE_FEATURES_tune-cortexa8hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa8"
20TUNE_FEATURES_tune-cortexa8thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa8" 26TUNE_FEATURES_tune-cortexa8thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa8"
21TUNE_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 a8e27ca87d..e2f78d3aa7 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/meta/conf/machine/include/tune-cortexa9.inc
@@ -7,6 +7,9 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon" 9AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon"
10ARMPKGARCH_tune-cortexa9 = "cortexa9"
11ARMPKGARCH_tune-cortexa9t = "cortexa9t"
12ARMPKGARCH_tune-cortexa9-neon = "cortexa9-neon"
10TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9" 13TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9"
11TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9" 14TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9"
12TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9" 15TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9"
@@ -16,6 +19,9 @@ PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon
16 19
17# VFP Tunes 20# VFP Tunes
18AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon" 21AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon"
22ARMPKGARCH_tune-cortexa9hf = "cortexa9hf"
23ARMPKGARCH_tune-cortexa9thf = "cortexa9thf"
24ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9hf-neon"
19TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9" 25TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9"
20TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9" 26TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9"
21TUNE_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-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index 3eecd5bfc4..ba3cbe97ab 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -6,6 +6,7 @@ TUNEVALID[cortexm1] = "Enable Cortex-M1 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexm1", "-mtune=cortex-m1", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexm1", "-mtune=cortex-m1", "", d)}"
7 7
8AVAILTUNES += "cortexm1" 8AVAILTUNES += "cortexm1"
9ARMPKGARCH_tune-cortexm1 = "cortexm1"
9TUNE_FEATURES_tune-cortexm1 = "${TUNE_FEATURES_tune-armv7a} cortexm1" 10TUNE_FEATURES_tune-cortexm1 = "${TUNE_FEATURES_tune-armv7a} cortexm1"
10PACKAGE_EXTRA_ARCHS_tune-cortexm1 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}" 11PACKAGE_EXTRA_ARCHS_tune-cortexm1 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}"
11 12
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc
index 20a3c655c0..72acdb5eb8 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -1,5 +1,4 @@
1DEFAULTTUNE ?= "cortexm3" 1DEFAULTTUNE ?= "cortexm3"
2ARMPKGARCH ?= "armv7m"
3 2
4require conf/machine/include/arm/arch-armv7a.inc 3require conf/machine/include/arm/arch-armv7a.inc
5 4
@@ -10,6 +9,7 @@ TUNEVALID[armv7m] = "Enable Cortex-M3 specific processor optimizations"
10TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7m", "-march=armv7-m", "", d)}" 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7m", "-march=armv7-m", "", d)}"
11 10
12AVAILTUNES += "cortexm3" 11AVAILTUNES += "cortexm3"
12ARMPKGARCH_tune-cortexm3 = "armv7m"
13TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3" 13TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3"
14PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp" 14PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp"
15 15
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc
index c8c2bfb8f8..3f38b6c0ec 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -1,5 +1,4 @@
1DEFAULTTUNE ?= "cortexr4" 1DEFAULTTUNE ?= "cortexr4"
2ARMPKGARCH ?= "armv7r"
3 2
4require conf/machine/include/arm/arch-armv7a.inc 3require conf/machine/include/arm/arch-armv7a.inc
5 4
@@ -10,5 +9,6 @@ TUNEVALID[armv7r] = "Enable Cortex-R4 specific processor optimizations"
10TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7r", "-march=armv7-r", "", d)}" 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7r", "-march=armv7-r", "", d)}"
11 10
12AVAILTUNES += "cortexr4" 11AVAILTUNES += "cortexr4"
12ARMPKGARCH_tune-cortexr4 = "armv7r"
13TUNE_FEATURES_tune-cortexr4 = "armv7r vfp cortexr4" 13TUNE_FEATURES_tune-cortexr4 = "armv7r vfp cortexr4"
14PACKAGE_EXTRA_ARCHS_tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp" 14PACKAGE_EXTRA_ARCHS_tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index f10123f0dc..09db6b484d 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -1,5 +1,4 @@
1DEFAULTTUNE ?= "ep9312" 1DEFAULTTUNE ?= "ep9312"
2ARMPKGARCH ?= "ep9312"
3 2
4require conf/machine/include/arm/arch-armv4.inc 3require conf/machine/include/arm/arch-armv4.inc
5 4
@@ -7,7 +6,6 @@ TUNEVALID[ep9312] = "Enable Intel PXA27x specific processor optimizations"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ep9312", "-march=ep9312 -mtune=ep9312", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ep9312", "-march=ep9312 -mtune=ep9312", "", d)}"
8 7
9AVAILTUNES += "ep9312" 8AVAILTUNES += "ep9312"
9ARMPKGARCH_tune-ep9312 = "ep9312"
10TUNE_FEATURES_tune-ep9312 = "thumb ep9312" 10TUNE_FEATURES_tune-ep9312 = "thumb ep9312"
11PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312" 11PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312"
12
13
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 14f59555a0..113d89f565 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -2,7 +2,6 @@
2# Please use tune-xscale for PXA255/PXA26x based processors. 2# Please use tune-xscale for PXA255/PXA26x based processors.
3 3
4DEFAULTTUNE ?= "iwmmxt" 4DEFAULTTUNE ?= "iwmmxt"
5ARMPKGARCH ?= "iwmmxt"
6 5
7require conf/machine/include/arm/arch-armv5-dsp.inc 6require conf/machine/include/arm/arch-armv5-dsp.inc
8 7
@@ -10,7 +9,6 @@ TUNEVALID[iwmmxt] = "Enable Intel PXA27x specific processor optimizations"
10TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "iwmmxt", "-march=iwmmxt -mtune=iwmmxt", "", d)}" 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "iwmmxt", "-march=iwmmxt -mtune=iwmmxt", "", d)}"
11 10
12AVAILTUNES += "iwmmxt" 11AVAILTUNES += "iwmmxt"
12ARMPKGARCH_tune-iwmmxt = "iwmmxt"
13TUNE_FEATURES_tune-iwmmxt = "thumb iwmmxt" 13TUNE_FEATURES_tune-iwmmxt = "thumb iwmmxt"
14PACKAGE_EXTRA_ARCHS_tune-iwmmxt = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} iwmmxt" 14PACKAGE_EXTRA_ARCHS_tune-iwmmxt = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} iwmmxt"
15
16
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index 66bab8e495..3beaaed3fa 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -6,6 +6,7 @@ TUNEVALID[strongarm] = "Enable Strongarm 1100 series processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "strongarm", "-mtune=strongarm1100", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "strongarm", "-mtune=strongarm1100", "", d)}"
7 7
8AVAILTUNES += "strongarm" 8AVAILTUNES += "strongarm"
9ARMPKGARCH_tune-strongarm = "strongarm"
9TUNE_FEATURES_tune-strongarm = "${TUNE_FEATURES_tune-armv4} strongarm" 10TUNE_FEATURES_tune-strongarm = "${TUNE_FEATURES_tune-armv4} strongarm"
10PACKAGE_EXTRA_ARCHS_tune-strongarm = "${PACKAGE_EXTRA_ARCHS_tune-armv4}" 11PACKAGE_EXTRA_ARCHS_tune-strongarm = "${PACKAGE_EXTRA_ARCHS_tune-armv4}"
11 12
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 0d5d060d04..d9925eb17e 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -6,10 +6,12 @@ TUNEVALID[xscale] = "Enable PXA255/PXA26x Xscale specific processor optimization
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-mtune=xscale", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-mtune=xscale", "", d)}"
7 7
8AVAILTUNES += "xscale" 8AVAILTUNES += "xscale"
9ARMPKGARCH_tune-xscale = "xscale"
9TUNE_FEATURES_tune-xscale = "${TUNE_FEATURES_tune-armv5te} xscale" 10TUNE_FEATURES_tune-xscale = "${TUNE_FEATURES_tune-armv5te} xscale"
10PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}" 11PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te}"
11 12
12AVAILTUNES += "xscale-be" 13AVAILTUNES += "xscale-be"
14ARMPKGARCH_tune-xscale-be = "xscale-be"
13TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-armv5teb} xscale bigendian" 15TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-armv5teb} xscale bigendian"
14PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}" 16PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}"
15 17