summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/README12
-rw-r--r--meta/conf/machine/include/arm/README2
-rw-r--r--meta/conf/machine/include/arm/arch-arm.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-arm64.inc22
-rw-r--r--meta/conf/machine/include/arm/arch-armv4.inc24
-rw-r--r--meta/conf/machine/include/arm/arch-armv5-dsp.inc72
-rw-r--r--meta/conf/machine/include/arm/arch-armv5.inc72
-rw-r--r--meta/conf/machine/include/arm/arch-armv6.inc72
-rw-r--r--meta/conf/machine/include/arm/arch-armv6m.inc6
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc288
-rw-r--r--meta/conf/machine/include/arm/arch-armv7ve.inc288
-rw-r--r--meta/conf/machine/include/arm/arch-armv8-2a.inc16
-rw-r--r--meta/conf/machine/include/arm/arch-armv8a.inc32
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa65.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa65ae.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa75-cortexa55.inc16
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa75.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc16
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa76.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa76ae.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa77.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-neoversee1.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-octeontx2.inc8
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa34.inc16
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa35.inc16
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa73.inc8
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc6
-rw-r--r--meta/conf/machine/include/m68k/arch-m68k.inc2
-rw-r--r--meta/conf/machine/include/mips/README4
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc154
-rw-r--r--meta/conf/machine/include/mips/tune-mips-24k.inc36
-rw-r--r--meta/conf/machine/include/mips/tune-mips-74k.inc24
-rw-r--r--meta/conf/machine/include/powerpc/README4
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc.inc40
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc64.inc16
-rw-r--r--meta/conf/machine/include/qemu.inc6
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc8
-rw-r--r--meta/conf/machine/include/riscv/arch-riscv.inc12
-rw-r--r--meta/conf/machine/include/riscv/qemuriscv.inc4
-rw-r--r--meta/conf/machine/include/riscv/tune-riscv.inc34
-rw-r--r--meta/conf/machine/include/sh/README4
-rw-r--r--meta/conf/machine/include/sh/arch-sh.inc4
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc12
-rw-r--r--meta/conf/machine/include/tune-arm1176jz-s.inc12
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc6
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc6
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc6
-rw-r--r--meta/conf/machine/include/tune-c3.inc8
-rw-r--r--meta/conf/machine/include/tune-core2.inc24
-rw-r--r--meta/conf/machine/include/tune-corei7.inc24
-rw-r--r--meta/conf/machine/include/tune-cortex-m0.inc6
-rw-r--r--meta/conf/machine/include/tune-cortex-m0plus.inc6
-rw-r--r--meta/conf/machine/include/tune-cortexa15.inc72
-rw-r--r--meta/conf/machine/include/tune-cortexa17.inc72
-rw-r--r--meta/conf/machine/include/tune-cortexa32.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa35.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa5.inc72
-rw-r--r--meta/conf/machine/include/tune-cortexa53.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa55.inc8
-rw-r--r--meta/conf/machine/include/tune-cortexa57-cortexa53.inc8
-rw-r--r--meta/conf/machine/include/tune-cortexa57.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa7.inc72
-rw-r--r--meta/conf/machine/include/tune-cortexa72-cortexa53.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa72.inc8
-rw-r--r--meta/conf/machine/include/tune-cortexa73-cortexa53.inc16
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc48
-rw-r--r--meta/conf/machine/include/tune-cortexa9.inc72
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc6
-rw-r--r--meta/conf/machine/include/tune-i586-nlp.inc8
-rw-r--r--meta/conf/machine/include/tune-i586.inc8
-rw-r--r--meta/conf/machine/include/tune-i686.inc8
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc6
-rw-r--r--meta/conf/machine/include/tune-mcf5441x.inc8
-rw-r--r--meta/conf/machine/include/tune-microblaze.inc4
-rw-r--r--meta/conf/machine/include/tune-mips32.inc24
-rw-r--r--meta/conf/machine/include/tune-mips32r2.inc24
-rw-r--r--meta/conf/machine/include/tune-mips32r6.inc24
-rw-r--r--meta/conf/machine/include/tune-mips64r2.inc96
-rw-r--r--meta/conf/machine/include/tune-mips64r6.inc64
-rw-r--r--meta/conf/machine/include/tune-octeon.inc32
-rw-r--r--meta/conf/machine/include/tune-power5.inc22
-rw-r--r--meta/conf/machine/include/tune-power6.inc22
-rw-r--r--meta/conf/machine/include/tune-power7.inc22
-rw-r--r--meta/conf/machine/include/tune-power9.inc38
-rw-r--r--meta/conf/machine/include/tune-ppc476.inc6
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc6
-rw-r--r--meta/conf/machine/include/tune-ppc7400.inc6
-rw-r--r--meta/conf/machine/include/tune-ppce300c2.inc6
-rw-r--r--meta/conf/machine/include/tune-ppce300c3.inc12
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc6
-rw-r--r--meta/conf/machine/include/tune-ppce500mc.inc6
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc6
-rw-r--r--meta/conf/machine/include/tune-ppce5500.inc18
-rw-r--r--meta/conf/machine/include/tune-ppce6500.inc22
-rw-r--r--meta/conf/machine/include/tune-sh3.inc16
-rw-r--r--meta/conf/machine/include/tune-sh4.inc32
-rw-r--r--meta/conf/machine/include/tune-strongarm1100.inc6
-rw-r--r--meta/conf/machine/include/tune-thunderx.inc16
-rw-r--r--meta/conf/machine/include/tune-xscale.inc12
-rw-r--r--meta/conf/machine/include/x86/README2
-rw-r--r--meta/conf/machine/include/x86/arch-x86.inc28
-rw-r--r--meta/conf/machine/qemuarm.conf4
-rw-r--r--meta/conf/machine/qemuarm64.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
105 files changed, 1339 insertions, 1339 deletions
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index d66130acbc..3ae68231d0 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -31,10 +31,10 @@ TUNECONFLICTS[feature] - A list of features which conflict with <feature>.
31New sanity checks will try to reject combinations in which a single 31New sanity checks will try to reject combinations in which a single
32tuning ends up with features which conflict with each other. 32tuning ends up with features which conflict with each other.
33 33
34TUNE_FEATURES - This is automatically defined as TUNE_FEATURES_tune-<tune>. 34TUNE_FEATURES - This is automatically defined as TUNE_FEATURES:tune-<tune>.
35See TUNE_FEATURES_tune-<tune> for more information. 35See TUNE_FEATURES:tune-<tune> for more information.
36 36
37TUNE_FEATURES_tune-<tune> - Specify the features used to describe a 37TUNE_FEATURES:tune-<tune> - Specify the features used to describe a
38specific tune. This is a list of features that a tune support, each 38specific tune. This is a list of features that a tune support, each
39feature must be in the TUNEVALID list. Note: the tune and a given 39feature must be in the TUNEVALID list. Note: the tune and a given
40feature name may be the same, but they have different purposes. Only 40feature name may be the same, but they have different purposes. Only
@@ -66,10 +66,10 @@ CPU family.
66 66
67PACKAGE_EXTRA_ARCHS - Lists all runtime compatible package 67PACKAGE_EXTRA_ARCHS - Lists all runtime compatible package
68architectures. By default this is equal to 68architectures. By default this is equal to
69PACKAGE_EXTRA_ARCHS_tune-<tune>. If an architecture deviates from the 69PACKAGE_EXTRA_ARCHS:tune-<tune>. If an architecture deviates from the
70default it will be listed in the architecture README. 70default it will be listed in the architecture README.
71 71
72PACKAGE_EXTRA_ARCHS_tune-<tune> - List all of the package architectures 72PACKAGE_EXTRA_ARCHS:tune-<tune> - List all of the package architectures
73that are compatible with this specific tune. The package arch of this 73that are compatible with this specific tune. The package arch of this
74tune must be in the list. 74tune must be in the list.
75 75
@@ -79,7 +79,7 @@ architecture specific floating point. This is synchronized with the
79compiler and other toolchain items. This should be dynamically 79compiler and other toolchain items. This should be dynamically
80configured in the same way that TUNE_CCARGS is. 80configured in the same way that TUNE_CCARGS is.
81 81
82BASE_LIB_tune-<tune> - The "/lib" location for a specific ABI. This is 82BASE_LIB:tune-<tune> - The "/lib" location for a specific ABI. This is
83used in a multilib configuration to place the libraries in the correct, 83used in a multilib configuration to place the libraries in the correct,
84non-conflicting locations. 84non-conflicting locations.
85 85
diff --git a/meta/conf/machine/include/arm/README b/meta/conf/machine/include/arm/README
index a1beb75fdf..c5637798e6 100644
--- a/meta/conf/machine/include/arm/README
+++ b/meta/conf/machine/include/arm/README
@@ -10,7 +10,7 @@ of the existence of the "bigendian" feature in a given tune.
10 10
11A small set of ARM specific variables have been defined to allow 11A small set of ARM specific variables have been defined to allow
12TUNE_PKGARCH to be automatically defined. Optimized tunings must NOT 12TUNE_PKGARCH to be automatically defined. Optimized tunings must NOT
13change the definiton of TUNE_PKGARCH. TUNE_PKGACH_tune-<tune> will be 13change the definiton of TUNE_PKGARCH. TUNE_PKGACH:tune-<tune> will be
14ignored. The format of the package arch is enforced by the TUNE_PKGARCH 14ignored. The format of the package arch is enforced by the TUNE_PKGARCH
15default. The format must be of the form: 15default. The format must be of the form:
16<armversion>[t][e][hf][b][-vfp][-neon] 16<armversion>[t][e][hf][b][-vfp][-neon]
diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc
index 99625d8417..869089051c 100644
--- a/meta/conf/machine/include/arm/arch-arm.inc
+++ b/meta/conf/machine/include/arm/arch-arm.inc
@@ -1,7 +1,7 @@
1 1
2TUNEVALID[bigendian] = "Enable big-endian mode." 2TUNEVALID[bigendian] = "Enable big-endian mode."
3 3
4ARMPKGARCH = "${ARMPKGARCH_tune-${DEFAULTTUNE}}" 4ARMPKGARCH = "${ARMPKGARCH:tune-${DEFAULTTUNE}}"
5ARMPKGSFX_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'b', '', d)}" 5ARMPKGSFX_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'b', '', d)}"
6ARMPKGSFX_FPU ??= "" 6ARMPKGSFX_FPU ??= ""
7ARMPKGSFX_DSP ??= "" 7ARMPKGSFX_DSP ??= ""
diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/meta/conf/machine/include/arm/arch-arm64.inc
index eab3323ec6..0e2efb5a40 100644
--- a/meta/conf/machine/include/arm/arch-arm64.inc
+++ b/meta/conf/machine/include/arm/arch-arm64.inc
@@ -9,17 +9,17 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'aarch64:'
9 9
10# Little Endian base configs 10# Little Endian base configs
11AVAILTUNES += "aarch64 aarch64_be" 11AVAILTUNES += "aarch64 aarch64_be"
12ARMPKGARCH_tune-aarch64 ?= "aarch64" 12ARMPKGARCH:tune-aarch64 ?= "aarch64"
13ARMPKGARCH_tune-aarch64_be ?= "aarch64" 13ARMPKGARCH:tune-aarch64_be ?= "aarch64"
14TUNE_FEATURES_tune-aarch64 = "aarch64" 14TUNE_FEATURES:tune-aarch64 = "aarch64"
15TUNE_FEATURES_tune-aarch64_be = "${TUNE_FEATURES_tune-aarch64} bigendian" 15TUNE_FEATURES:tune-aarch64_be = "${TUNE_FEATURES:tune-aarch64} bigendian"
16TUNE_PKGARCH_64_tune-aarch64 = "aarch64" 16TUNE_PKGARCH_64:tune-aarch64 = "aarch64"
17TUNE_PKGARCH_64_tune-aarch64_be = "aarch64_be" 17TUNE_PKGARCH_64:tune-aarch64_be = "aarch64_be"
18BASE_LIB_tune-aarch64 = "lib64" 18BASE_LIB:tune-aarch64 = "lib64"
19BASE_LIB_tune-aarch64_be = "lib64" 19BASE_LIB:tune-aarch64_be = "lib64"
20 20
21PACKAGE_EXTRA_ARCHS_tune-aarch64 = "aarch64" 21PACKAGE_EXTRA_ARCHS:tune-aarch64 = "aarch64"
22PACKAGE_EXTRA_ARCHS_tune-aarch64_be = "aarch64_be" 22PACKAGE_EXTRA_ARCHS:tune-aarch64_be = "aarch64_be"
23 23
24ARMPKGSFX_ENDIAN_64 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '_be', '', d)}" 24ARMPKGSFX_ENDIAN_64 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '_be', '', d)}"
25TUNE_ARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" 25TUNE_ARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}"
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index b71739c20a..4f4a63b287 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -17,18 +17,18 @@ require conf/machine/include/arm/feature-arm-thumb.inc
17 17
18# Little Endian 18# Little Endian
19AVAILTUNES += "armv4 armv4t" 19AVAILTUNES += "armv4 armv4t"
20ARMPKGARCH_tune-armv4 ?= "armv4" 20ARMPKGARCH:tune-armv4 ?= "armv4"
21ARMPKGARCH_tune-armv4t ?= "armv4" 21ARMPKGARCH:tune-armv4t ?= "armv4"
22TUNE_FEATURES_tune-armv4 = "arm armv4" 22TUNE_FEATURES:tune-armv4 = "arm armv4"
23TUNE_FEATURES_tune-armv4t = "${TUNE_FEATURES_tune-armv4} thumb" 23TUNE_FEATURES:tune-armv4t = "${TUNE_FEATURES:tune-armv4} thumb"
24PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4" 24PACKAGE_EXTRA_ARCHS:tune-armv4 = "arm armv4"
25PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t" 25PACKAGE_EXTRA_ARCHS:tune-armv4t = "${PACKAGE_EXTRA_ARCHS:tune-armv4} armv4t"
26 26
27# Big Endian 27# Big Endian
28AVAILTUNES += "armv4b armv4tb" 28AVAILTUNES += "armv4b armv4tb"
29ARMPKGARCH_tune-armv4b ?= "armv4" 29ARMPKGARCH:tune-armv4b ?= "armv4"
30ARMPKGARCH_tune-armv4tb ?= "armv4" 30ARMPKGARCH:tune-armv4tb ?= "armv4"
31TUNE_FEATURES_tune-armv4b = "${TUNE_FEATURES_tune-armv4} bigendian" 31TUNE_FEATURES:tune-armv4b = "${TUNE_FEATURES:tune-armv4} bigendian"
32TUNE_FEATURES_tune-armv4tb = "${TUNE_FEATURES_tune-armv4t} bigendian" 32TUNE_FEATURES:tune-armv4tb = "${TUNE_FEATURES:tune-armv4t} bigendian"
33PACKAGE_EXTRA_ARCHS_tune-armv4b = "armeb armv4b" 33PACKAGE_EXTRA_ARCHS:tune-armv4b = "armeb armv4b"
34PACKAGE_EXTRA_ARCHS_tune-armv4tb = "${PACKAGE_EXTRA_ARCHS_tune-armv4b} armv4tb" 34PACKAGE_EXTRA_ARCHS:tune-armv4tb = "${PACKAGE_EXTRA_ARCHS:tune-armv4b} armv4tb"
diff --git a/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
index d117af1520..d296e827cf 100644
--- a/meta/conf/machine/include/arm/arch-armv5-dsp.inc
+++ b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
@@ -5,48 +5,48 @@ require conf/machine/include/arm/arch-armv5.inc
5 5
6# Little Endian 6# Little Endian
7AVAILTUNES += "armv5e armv5te" 7AVAILTUNES += "armv5e armv5te"
8ARMPKGARCH_tune-armv5e ?= "armv5" 8ARMPKGARCH:tune-armv5e ?= "armv5"
9ARMPKGARCH_tune-armv5te ?= "armv5" 9ARMPKGARCH:tune-armv5te ?= "armv5"
10TUNE_FEATURES_tune-armv5e = "${TUNE_FEATURES_tune-armv5} dsp" 10TUNE_FEATURES:tune-armv5e = "${TUNE_FEATURES:tune-armv5} dsp"
11TUNE_FEATURES_tune-armv5te = "${TUNE_FEATURES_tune-armv5t} dsp" 11TUNE_FEATURES:tune-armv5te = "${TUNE_FEATURES:tune-armv5t} dsp"
12PACKAGE_EXTRA_ARCHS_tune-armv5e = "${PACKAGE_EXTRA_ARCHS_tune-armv5} armv5e" 12PACKAGE_EXTRA_ARCHS:tune-armv5e = "${PACKAGE_EXTRA_ARCHS:tune-armv5} armv5e"
13PACKAGE_EXTRA_ARCHS_tune-armv5te = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv5e armv5te" 13PACKAGE_EXTRA_ARCHS:tune-armv5te = "${PACKAGE_EXTRA_ARCHS:tune-armv5t} armv5e armv5te"
14 14
15# Little Endian + VFP/DSP 15# Little Endian + VFP/DSP
16AVAILTUNES += "armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp" 16AVAILTUNES += "armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp"
17ARMPKGARCH_tune-armv5e-vfp ?= "armv5" 17ARMPKGARCH:tune-armv5e-vfp ?= "armv5"
18ARMPKGARCH_tune-armv5te-vfp ?= "armv5" 18ARMPKGARCH:tune-armv5te-vfp ?= "armv5"
19ARMPKGARCH_tune-armv5ehf-vfp ?= "armv5" 19ARMPKGARCH:tune-armv5ehf-vfp ?= "armv5"
20ARMPKGARCH_tune-armv5tehf-vfp ?= "armv5" 20ARMPKGARCH:tune-armv5tehf-vfp ?= "armv5"
21TUNE_FEATURES_tune-armv5e-vfp = "${TUNE_FEATURES_tune-armv5e} vfp" 21TUNE_FEATURES:tune-armv5e-vfp = "${TUNE_FEATURES:tune-armv5e} vfp"
22TUNE_FEATURES_tune-armv5te-vfp = "${TUNE_FEATURES_tune-armv5te} vfp" 22TUNE_FEATURES:tune-armv5te-vfp = "${TUNE_FEATURES:tune-armv5te} vfp"
23TUNE_FEATURES_tune-armv5ehf-vfp = "${TUNE_FEATURES_tune-armv5e-vfp} callconvention-hard" 23TUNE_FEATURES:tune-armv5ehf-vfp = "${TUNE_FEATURES:tune-armv5e-vfp} callconvention-hard"
24TUNE_FEATURES_tune-armv5tehf-vfp = "${TUNE_FEATURES_tune-armv5te-vfp} callconvention-hard" 24TUNE_FEATURES:tune-armv5tehf-vfp = "${TUNE_FEATURES:tune-armv5te-vfp} callconvention-hard"
25PACKAGE_EXTRA_ARCHS_tune-armv5e-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5-vfp} armv5e armv5e-vfp" 25PACKAGE_EXTRA_ARCHS:tune-armv5e-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5-vfp} armv5e armv5e-vfp"
26PACKAGE_EXTRA_ARCHS_tune-armv5te-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp} armv5e armv5te armv5e-vfp armv5te-vfp" 26PACKAGE_EXTRA_ARCHS:tune-armv5te-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5t-vfp} armv5e armv5te armv5e-vfp armv5te-vfp"
27PACKAGE_EXTRA_ARCHS_tune-armv5ehf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp} armv5ehf-vfp" 27PACKAGE_EXTRA_ARCHS:tune-armv5ehf-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5hf-vfp} armv5ehf-vfp"
28PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp} armv5ehf-vfp armv5tehf-vfp" 28PACKAGE_EXTRA_ARCHS:tune-armv5tehf-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5thf-vfp} armv5ehf-vfp armv5tehf-vfp"
29 29
30# Big Endian 30# Big Endian
31AVAILTUNES += "armv5eb armv5teb" 31AVAILTUNES += "armv5eb armv5teb"
32ARMPKGARCH_tune-armv5eb ?= "armv5" 32ARMPKGARCH:tune-armv5eb ?= "armv5"
33ARMPKGARCH_tune-armv5teb ?= "armv5" 33ARMPKGARCH:tune-armv5teb ?= "armv5"
34TUNE_FEATURES_tune-armv5eb = "${TUNE_FEATURES_tune-armv5e} bigendian" 34TUNE_FEATURES:tune-armv5eb = "${TUNE_FEATURES:tune-armv5e} bigendian"
35TUNE_FEATURES_tune-armv5teb = "${TUNE_FEATURES_tune-armv5te} bigendian" 35TUNE_FEATURES:tune-armv5teb = "${TUNE_FEATURES:tune-armv5te} bigendian"
36PACKAGE_EXTRA_ARCHS_tune-armv5eb = "${PACKAGE_EXTRA_ARCHS_tune-armv5b} armv5eb" 36PACKAGE_EXTRA_ARCHS:tune-armv5eb = "${PACKAGE_EXTRA_ARCHS:tune-armv5b} armv5eb"
37PACKAGE_EXTRA_ARCHS_tune-armv5teb = "${PACKAGE_EXTRA_ARCHS_tune-armv5tb} armv5eb armv5teb" 37PACKAGE_EXTRA_ARCHS:tune-armv5teb = "${PACKAGE_EXTRA_ARCHS:tune-armv5tb} armv5eb armv5teb"
38 38
39# Big Endian + VFP/DSP 39# Big Endian + VFP/DSP
40AVAILTUNES += "armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp" 40AVAILTUNES += "armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp"
41ARMPKGARCH_tune-armv5eb-vfp ?= "armv5" 41ARMPKGARCH:tune-armv5eb-vfp ?= "armv5"
42ARMPKGARCH_tune-armv5teb-vfp ?= "armv5" 42ARMPKGARCH:tune-armv5teb-vfp ?= "armv5"
43ARMPKGARCH_tune-armv5ehfb-vfp ?= "armv5" 43ARMPKGARCH:tune-armv5ehfb-vfp ?= "armv5"
44ARMPKGARCH_tune-armv5tehfb-vfp ?= "armv5" 44ARMPKGARCH:tune-armv5tehfb-vfp ?= "armv5"
45TUNE_FEATURES_tune-armv5eb-vfp = "${TUNE_FEATURES_tune-armv5e-vfp} bigendian" 45TUNE_FEATURES:tune-armv5eb-vfp = "${TUNE_FEATURES:tune-armv5e-vfp} bigendian"
46TUNE_FEATURES_tune-armv5teb-vfp = "${TUNE_FEATURES_tune-armv5te-vfp} bigendian" 46TUNE_FEATURES:tune-armv5teb-vfp = "${TUNE_FEATURES:tune-armv5te-vfp} bigendian"
47TUNE_FEATURES_tune-armv5ehfb-vfp = "${TUNE_FEATURES_tune-armv5ehf-vfp} bigendian" 47TUNE_FEATURES:tune-armv5ehfb-vfp = "${TUNE_FEATURES:tune-armv5ehf-vfp} bigendian"
48TUNE_FEATURES_tune-armv5tehfb-vfp = "${TUNE_FEATURES_tune-armv5tehf-vfp} bigendian" 48TUNE_FEATURES:tune-armv5tehfb-vfp = "${TUNE_FEATURES:tune-armv5tehf-vfp} bigendian"
49PACKAGE_EXTRA_ARCHS_tune-armv5eb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5b-vfp} armv5eb armv5eb-vfp" 49PACKAGE_EXTRA_ARCHS:tune-armv5eb-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5b-vfp} armv5eb armv5eb-vfp"
50PACKAGE_EXTRA_ARCHS_tune-armv5teb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5tb-vfp} armv5eb armv5teb armv5eb-vfp armv5teb-vfp" 50PACKAGE_EXTRA_ARCHS:tune-armv5teb-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5tb-vfp} armv5eb armv5teb armv5eb-vfp armv5teb-vfp"
51PACKAGE_EXTRA_ARCHS_tune-armv5ehfb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5hfb-vfp} armv5ehfb-vfp" 51PACKAGE_EXTRA_ARCHS:tune-armv5ehfb-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5hfb-vfp} armv5ehfb-vfp"
52PACKAGE_EXTRA_ARCHS_tune-armv5tehfb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5thfb-vfp} armv5ehfb-vfp armv5tehfb-vfp" 52PACKAGE_EXTRA_ARCHS:tune-armv5tehfb-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5thfb-vfp} armv5ehfb-vfp armv5tehfb-vfp"
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 52d8590165..5f46992098 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -10,48 +10,48 @@ require conf/machine/include/arm/feature-arm-vfp.inc
10 10
11# Little Endian 11# Little Endian
12AVAILTUNES += "armv5 armv5t" 12AVAILTUNES += "armv5 armv5t"
13ARMPKGARCH_tune-armv5 ?= "armv5" 13ARMPKGARCH:tune-armv5 ?= "armv5"
14ARMPKGARCH_tune-armv5t ?= "armv5" 14ARMPKGARCH:tune-armv5t ?= "armv5"
15TUNE_FEATURES_tune-armv5 = "arm armv5" 15TUNE_FEATURES:tune-armv5 = "arm armv5"
16TUNE_FEATURES_tune-armv5t = "${TUNE_FEATURES_tune-armv5} thumb" 16TUNE_FEATURES:tune-armv5t = "${TUNE_FEATURES:tune-armv5} thumb"
17PACKAGE_EXTRA_ARCHS_tune-armv5 = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv5" 17PACKAGE_EXTRA_ARCHS:tune-armv5 = "${PACKAGE_EXTRA_ARCHS:tune-armv4} armv5"
18PACKAGE_EXTRA_ARCHS_tune-armv5t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} armv5 armv5t" 18PACKAGE_EXTRA_ARCHS:tune-armv5t = "${PACKAGE_EXTRA_ARCHS:tune-armv4t} armv5 armv5t"
19 19
20# Little Endian + VFP/DSP 20# Little Endian + VFP/DSP
21AVAILTUNES += "armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp" 21AVAILTUNES += "armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp"
22ARMPKGARCH_tune-armv5-vfp ?= "armv5" 22ARMPKGARCH:tune-armv5-vfp ?= "armv5"
23ARMPKGARCH_tune-armv5t-vfp ?= "armv5" 23ARMPKGARCH:tune-armv5t-vfp ?= "armv5"
24ARMPKGARCH_tune-armv5hf-vfp ?= "armv5" 24ARMPKGARCH:tune-armv5hf-vfp ?= "armv5"
25ARMPKGARCH_tune-armv5thf-vfp ?= "armv5" 25ARMPKGARCH:tune-armv5thf-vfp ?= "armv5"
26TUNE_FEATURES_tune-armv5-vfp = "${TUNE_FEATURES_tune-armv5} vfp" 26TUNE_FEATURES:tune-armv5-vfp = "${TUNE_FEATURES:tune-armv5} vfp"
27TUNE_FEATURES_tune-armv5t-vfp = "${TUNE_FEATURES_tune-armv5t} vfp" 27TUNE_FEATURES:tune-armv5t-vfp = "${TUNE_FEATURES:tune-armv5t} vfp"
28TUNE_FEATURES_tune-armv5hf-vfp = "${TUNE_FEATURES_tune-armv5-vfp} callconvention-hard" 28TUNE_FEATURES:tune-armv5hf-vfp = "${TUNE_FEATURES:tune-armv5-vfp} callconvention-hard"
29TUNE_FEATURES_tune-armv5thf-vfp = "${TUNE_FEATURES_tune-armv5t-vfp} callconvention-hard" 29TUNE_FEATURES:tune-armv5thf-vfp = "${TUNE_FEATURES:tune-armv5t-vfp} callconvention-hard"
30PACKAGE_EXTRA_ARCHS_tune-armv5-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5} armv5-vfp" 30PACKAGE_EXTRA_ARCHS:tune-armv5-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5} armv5-vfp"
31PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv5-vfp armv5t-vfp" 31PACKAGE_EXTRA_ARCHS:tune-armv5t-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5t} armv5-vfp armv5t-vfp"
32PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp = "armv5hf-vfp" 32PACKAGE_EXTRA_ARCHS:tune-armv5hf-vfp = "armv5hf-vfp"
33PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp = "armv5hf-vfp armv5thf-vfp" 33PACKAGE_EXTRA_ARCHS:tune-armv5thf-vfp = "armv5hf-vfp armv5thf-vfp"
34 34
35# Big Endian 35# Big Endian
36AVAILTUNES += "armv5b armv5tb" 36AVAILTUNES += "armv5b armv5tb"
37ARMPKGARCH_tune-armv5b ?= "armv5" 37ARMPKGARCH:tune-armv5b ?= "armv5"
38ARMPKGARCH_tune-armv5tb ?= "armv5" 38ARMPKGARCH:tune-armv5tb ?= "armv5"
39TUNE_FEATURES_tune-armv5b = "${TUNE_FEATURES_tune-armv5} bigendian" 39TUNE_FEATURES:tune-armv5b = "${TUNE_FEATURES:tune-armv5} bigendian"
40TUNE_FEATURES_tune-armv5tb = "${TUNE_FEATURES_tune-armv5t} bigendian" 40TUNE_FEATURES:tune-armv5tb = "${TUNE_FEATURES:tune-armv5t} bigendian"
41PACKAGE_EXTRA_ARCHS_tune-armv5b = "${PACKAGE_EXTRA_ARCHS_tune-armv4b} armv5b" 41PACKAGE_EXTRA_ARCHS:tune-armv5b = "${PACKAGE_EXTRA_ARCHS:tune-armv4b} armv5b"
42PACKAGE_EXTRA_ARCHS_tune-armv5tb = "${PACKAGE_EXTRA_ARCHS_tune-armv4tb} armv5b armv5tb" 42PACKAGE_EXTRA_ARCHS:tune-armv5tb = "${PACKAGE_EXTRA_ARCHS:tune-armv4tb} armv5b armv5tb"
43 43
44# Big Endian + VFP/DSP 44# Big Endian + VFP/DSP
45AVAILTUNES += "armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp" 45AVAILTUNES += "armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp"
46ARMPKGARCH_tune-armv5b-vfp ?= "armv5" 46ARMPKGARCH:tune-armv5b-vfp ?= "armv5"
47ARMPKGARCH_tune-armv5tb-vfp ?= "armv5" 47ARMPKGARCH:tune-armv5tb-vfp ?= "armv5"
48ARMPKGARCH_tune-armv5hfb-vfp ?= "armv5" 48ARMPKGARCH:tune-armv5hfb-vfp ?= "armv5"
49ARMPKGARCH_tune-armv5thfb-vfp ?= "armv5" 49ARMPKGARCH:tune-armv5thfb-vfp ?= "armv5"
50TUNE_FEATURES_tune-armv5b-vfp = "${TUNE_FEATURES_tune-armv5-vfp} bigendian" 50TUNE_FEATURES:tune-armv5b-vfp = "${TUNE_FEATURES:tune-armv5-vfp} bigendian"
51TUNE_FEATURES_tune-armv5tb-vfp = "${TUNE_FEATURES_tune-armv5t-vfp} bigendian" 51TUNE_FEATURES:tune-armv5tb-vfp = "${TUNE_FEATURES:tune-armv5t-vfp} bigendian"
52TUNE_FEATURES_tune-armv5hfb-vfp = "${TUNE_FEATURES_tune-armv5hf-vfp} bigendian" 52TUNE_FEATURES:tune-armv5hfb-vfp = "${TUNE_FEATURES:tune-armv5hf-vfp} bigendian"
53TUNE_FEATURES_tune-armv5thfb-vfp = "${TUNE_FEATURES_tune-armv5thf-vfp} bigendian" 53TUNE_FEATURES:tune-armv5thfb-vfp = "${TUNE_FEATURES:tune-armv5thf-vfp} bigendian"
54PACKAGE_EXTRA_ARCHS_tune-armv5b-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5b} armv5b-vfp" 54PACKAGE_EXTRA_ARCHS:tune-armv5b-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5b} armv5b-vfp"
55PACKAGE_EXTRA_ARCHS_tune-armv5tb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5tb} armv5b-vfp armv5tb-vfp" 55PACKAGE_EXTRA_ARCHS:tune-armv5tb-vfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5tb} armv5b-vfp armv5tb-vfp"
56PACKAGE_EXTRA_ARCHS_tune-armv5hfb-vfp = "armv5hfb-vfp" 56PACKAGE_EXTRA_ARCHS:tune-armv5hfb-vfp = "armv5hfb-vfp"
57PACKAGE_EXTRA_ARCHS_tune-armv5thfb-vfp = "armv5hfb-vfp armv5thfb-vfp" 57PACKAGE_EXTRA_ARCHS:tune-armv5thfb-vfp = "armv5hfb-vfp armv5thfb-vfp"
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index 7531890e2e..9d2e112b71 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -9,42 +9,42 @@ require conf/machine/include/arm/arch-armv5-dsp.inc
9 9
10# Little Endian 10# Little Endian
11AVAILTUNES += "armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf" 11AVAILTUNES += "armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf"
12ARMPKGARCH_tune-armv6-novfp ?= "armv6" 12ARMPKGARCH:tune-armv6-novfp ?= "armv6"
13ARMPKGARCH_tune-armv6t-novfp ?= "armv6" 13ARMPKGARCH:tune-armv6t-novfp ?= "armv6"
14ARMPKGARCH_tune-armv6 ?= "armv6" 14ARMPKGARCH:tune-armv6 ?= "armv6"
15ARMPKGARCH_tune-armv6t ?= "armv6" 15ARMPKGARCH:tune-armv6t ?= "armv6"
16ARMPKGARCH_tune-armv6hf ?= "armv6" 16ARMPKGARCH:tune-armv6hf ?= "armv6"
17ARMPKGARCH_tune-armv6thf ?= "armv6" 17ARMPKGARCH:tune-armv6thf ?= "armv6"
18TUNE_FEATURES_tune-armv6-novfp = "arm armv6" 18TUNE_FEATURES:tune-armv6-novfp = "arm armv6"
19TUNE_FEATURES_tune-armv6t-novfp = "${TUNE_FEATURES_tune-armv6-novfp} thumb" 19TUNE_FEATURES:tune-armv6t-novfp = "${TUNE_FEATURES:tune-armv6-novfp} thumb"
20TUNE_FEATURES_tune-armv6 = "${TUNE_FEATURES_tune-armv6-novfp} vfp" 20TUNE_FEATURES:tune-armv6 = "${TUNE_FEATURES:tune-armv6-novfp} vfp"
21TUNE_FEATURES_tune-armv6t = "${TUNE_FEATURES_tune-armv6t-novfp} vfp" 21TUNE_FEATURES:tune-armv6t = "${TUNE_FEATURES:tune-armv6t-novfp} vfp"
22TUNE_FEATURES_tune-armv6hf = "${TUNE_FEATURES_tune-armv6} callconvention-hard" 22TUNE_FEATURES:tune-armv6hf = "${TUNE_FEATURES:tune-armv6} callconvention-hard"
23TUNE_FEATURES_tune-armv6thf = "${TUNE_FEATURES_tune-armv6t} callconvention-hard" 23TUNE_FEATURES:tune-armv6thf = "${TUNE_FEATURES:tune-armv6t} callconvention-hard"
24PACKAGE_EXTRA_ARCHS_tune-armv6-novfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5e} armv6" 24PACKAGE_EXTRA_ARCHS:tune-armv6-novfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5e} armv6"
25PACKAGE_EXTRA_ARCHS_tune-armv6t-novfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} armv6 armv6t" 25PACKAGE_EXTRA_ARCHS:tune-armv6t-novfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5te} armv6 armv6t"
26PACKAGE_EXTRA_ARCHS_tune-armv6 = "${PACKAGE_EXTRA_ARCHS_tune-armv5e-vfp} armv6 armv6-vfp" 26PACKAGE_EXTRA_ARCHS:tune-armv6 = "${PACKAGE_EXTRA_ARCHS:tune-armv5e-vfp} armv6 armv6-vfp"
27PACKAGE_EXTRA_ARCHS_tune-armv6t = "${PACKAGE_EXTRA_ARCHS_tune-armv5te-vfp} armv6 armv6t armv6-vfp armv6t-vfp" 27PACKAGE_EXTRA_ARCHS:tune-armv6t = "${PACKAGE_EXTRA_ARCHS:tune-armv5te-vfp} armv6 armv6t armv6-vfp armv6t-vfp"
28PACKAGE_EXTRA_ARCHS_tune-armv6hf = "${PACKAGE_EXTRA_ARCHS_tune-armv5ehf-vfp} armv6hf-vfp" 28PACKAGE_EXTRA_ARCHS:tune-armv6hf = "${PACKAGE_EXTRA_ARCHS:tune-armv5ehf-vfp} armv6hf-vfp"
29PACKAGE_EXTRA_ARCHS_tune-armv6thf = "${PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp} armv6hf-vfp armv6thf-vfp" 29PACKAGE_EXTRA_ARCHS:tune-armv6thf = "${PACKAGE_EXTRA_ARCHS:tune-armv5tehf-vfp} armv6hf-vfp armv6thf-vfp"
30 30
31# Big Endian 31# Big Endian
32AVAILTUNES += "armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb" 32AVAILTUNES += "armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb"
33ARMPKGARCH_tune-armv6b-novfp ?= "armv6" 33ARMPKGARCH:tune-armv6b-novfp ?= "armv6"
34ARMPKGARCH_tune-armv6tb-novfp ?= "armv6" 34ARMPKGARCH:tune-armv6tb-novfp ?= "armv6"
35ARMPKGARCH_tune-armv6b ?= "armv6" 35ARMPKGARCH:tune-armv6b ?= "armv6"
36ARMPKGARCH_tune-armv6tb ?= "armv6" 36ARMPKGARCH:tune-armv6tb ?= "armv6"
37ARMPKGARCH_tune-armv6hfb ?= "armv6" 37ARMPKGARCH:tune-armv6hfb ?= "armv6"
38ARMPKGARCH_tune-armv6thfb ?= "armv6" 38ARMPKGARCH:tune-armv6thfb ?= "armv6"
39TUNE_FEATURES_tune-armv6b-novfp = "${TUNE_FEATURES_tune-armv6-novfp} bigendian" 39TUNE_FEATURES:tune-armv6b-novfp = "${TUNE_FEATURES:tune-armv6-novfp} bigendian"
40TUNE_FEATURES_tune-armv6tb-novfp = "${TUNE_FEATURES_tune-armv6t-novfp} bigendian" 40TUNE_FEATURES:tune-armv6tb-novfp = "${TUNE_FEATURES:tune-armv6t-novfp} bigendian"
41TUNE_FEATURES_tune-armv6b = "${TUNE_FEATURES_tune-armv6} bigendian" 41TUNE_FEATURES:tune-armv6b = "${TUNE_FEATURES:tune-armv6} bigendian"
42TUNE_FEATURES_tune-armv6tb = "${TUNE_FEATURES_tune-armv6t} bigendian" 42TUNE_FEATURES:tune-armv6tb = "${TUNE_FEATURES:tune-armv6t} bigendian"
43TUNE_FEATURES_tune-armv6hfb = "${TUNE_FEATURES_tune-armv6hf} bigendian" 43TUNE_FEATURES:tune-armv6hfb = "${TUNE_FEATURES:tune-armv6hf} bigendian"
44TUNE_FEATURES_tune-armv6thfb = "${TUNE_FEATURES_tune-armv6thf} bigendian" 44TUNE_FEATURES:tune-armv6thfb = "${TUNE_FEATURES:tune-armv6thf} bigendian"
45PACKAGE_EXTRA_ARCHS_tune-armv6b-novfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5eb} armv6b" 45PACKAGE_EXTRA_ARCHS:tune-armv6b-novfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5eb} armv6b"
46PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb} armv6b armv6tb" 46PACKAGE_EXTRA_ARCHS:tune-armv6tb-novfp = "${PACKAGE_EXTRA_ARCHS:tune-armv5teb} armv6b armv6tb"
47PACKAGE_EXTRA_ARCHS_tune-armv6b = "${PACKAGE_EXTRA_ARCHS_tune-armv5eb-vfp} armv6b armv6b-vfp" 47PACKAGE_EXTRA_ARCHS:tune-armv6b = "${PACKAGE_EXTRA_ARCHS:tune-armv5eb-vfp} armv6b armv6b-vfp"
48PACKAGE_EXTRA_ARCHS_tune-armv6tb = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb-vfp} armv6b armv6tb armv6b-vfp armv6tb-vfp" 48PACKAGE_EXTRA_ARCHS:tune-armv6tb = "${PACKAGE_EXTRA_ARCHS:tune-armv5teb-vfp} armv6b armv6tb armv6b-vfp armv6tb-vfp"
49PACKAGE_EXTRA_ARCHS_tune-armv6hfb = "${PACKAGE_EXTRA_ARCHS_tune-armv5ehfb-vfp} armv6hfb-vfp" 49PACKAGE_EXTRA_ARCHS:tune-armv6hfb = "${PACKAGE_EXTRA_ARCHS:tune-armv5ehfb-vfp} armv6hfb-vfp"
50PACKAGE_EXTRA_ARCHS_tune-armv6thfb = "${PACKAGE_EXTRA_ARCHS_tune-armv5tehfb-vfp} armv6hfb-vfp armv6thfb-vfp" 50PACKAGE_EXTRA_ARCHS:tune-armv6thfb = "${PACKAGE_EXTRA_ARCHS:tune-armv5tehfb-vfp} armv6hfb-vfp armv6thfb-vfp"
diff --git a/meta/conf/machine/include/arm/arch-armv6m.inc b/meta/conf/machine/include/arm/arch-armv6m.inc
index 739550d005..e7ca665a02 100644
--- a/meta/conf/machine/include/arm/arch-armv6m.inc
+++ b/meta/conf/machine/include/arm/arch-armv6m.inc
@@ -14,6 +14,6 @@ require conf/machine/include/arm/arch-armv5.inc
14 14
15# Little Endian 15# Little Endian
16AVAILTUNES += "armv6m" 16AVAILTUNES += "armv6m"
17ARMPKGARCH_tune-armv6m = "armv6m" 17ARMPKGARCH:tune-armv6m = "armv6m"
18TUNE_FEATURES_tune-armv6m = "armv6m" 18TUNE_FEATURES:tune-armv6m = "armv6m"
19PACKAGE_EXTRA_ARCHS_tune-armv6m = "armv6m" 19PACKAGE_EXTRA_ARCHS:tune-armv6m = "armv6m"
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index ce87af5306..0f83cee37c 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -11,156 +11,156 @@ require conf/machine/include/arm/feature-arm-neon.inc
11 11
12# Little Endian base configs 12# Little Endian base configs
13AVAILTUNES += "armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4" 13AVAILTUNES += "armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4"
14ARMPKGARCH_tune-armv7a ?= "armv7a" 14ARMPKGARCH:tune-armv7a ?= "armv7a"
15ARMPKGARCH_tune-armv7at ?= "armv7a" 15ARMPKGARCH:tune-armv7at ?= "armv7a"
16ARMPKGARCH_tune-armv7a-vfpv3d16 ?= "armv7a" 16ARMPKGARCH:tune-armv7a-vfpv3d16 ?= "armv7a"
17ARMPKGARCH_tune-armv7at-vfpv3d16 ?= "armv7a" 17ARMPKGARCH:tune-armv7at-vfpv3d16 ?= "armv7a"
18ARMPKGARCH_tune-armv7a-vfpv3 ?= "armv7a" 18ARMPKGARCH:tune-armv7a-vfpv3 ?= "armv7a"
19ARMPKGARCH_tune-armv7at-vfpv3 ?= "armv7a" 19ARMPKGARCH:tune-armv7at-vfpv3 ?= "armv7a"
20ARMPKGARCH_tune-armv7a-vfpv4d16 ?= "armv7a" 20ARMPKGARCH:tune-armv7a-vfpv4d16 ?= "armv7a"
21ARMPKGARCH_tune-armv7at-vfpv4d16 ?= "armv7a" 21ARMPKGARCH:tune-armv7at-vfpv4d16 ?= "armv7a"
22ARMPKGARCH_tune-armv7a-neon ?= "armv7a" 22ARMPKGARCH:tune-armv7a-neon ?= "armv7a"
23ARMPKGARCH_tune-armv7at-neon ?= "armv7a" 23ARMPKGARCH:tune-armv7at-neon ?= "armv7a"
24ARMPKGARCH_tune-armv7a-neon-vfpv4 ?= "armv7a" 24ARMPKGARCH:tune-armv7a-neon-vfpv4 ?= "armv7a"
25ARMPKGARCH_tune-armv7at-neon-vfpv4 ?= "armv7a" 25ARMPKGARCH:tune-armv7at-neon-vfpv4 ?= "armv7a"
26TUNE_FEATURES_tune-armv7a = "arm armv7a vfp" 26TUNE_FEATURES:tune-armv7a = "arm armv7a vfp"
27TUNE_FEATURES_tune-armv7at = "${TUNE_FEATURES_tune-armv7a} thumb" 27TUNE_FEATURES:tune-armv7at = "${TUNE_FEATURES:tune-armv7a} thumb"
28TUNE_FEATURES_tune-armv7a-vfpv3d16 = "${TUNE_FEATURES_tune-armv7a} vfpv3d16" 28TUNE_FEATURES:tune-armv7a-vfpv3d16 = "${TUNE_FEATURES:tune-armv7a} vfpv3d16"
29TUNE_FEATURES_tune-armv7at-vfpv3d16 = "${TUNE_FEATURES_tune-armv7at} vfpv3d16" 29TUNE_FEATURES:tune-armv7at-vfpv3d16 = "${TUNE_FEATURES:tune-armv7at} vfpv3d16"
30TUNE_FEATURES_tune-armv7a-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3d16} vfpv3" 30TUNE_FEATURES:tune-armv7a-vfpv3 = "${TUNE_FEATURES:tune-armv7a-vfpv3d16} vfpv3"
31TUNE_FEATURES_tune-armv7at-vfpv3 = "${TUNE_FEATURES_tune-armv7at-vfpv3d16} vfpv3" 31TUNE_FEATURES:tune-armv7at-vfpv3 = "${TUNE_FEATURES:tune-armv7at-vfpv3d16} vfpv3"
32TUNE_FEATURES_tune-armv7a-vfpv4d16 = "${TUNE_FEATURES_tune-armv7a} vfpv4d16" 32TUNE_FEATURES:tune-armv7a-vfpv4d16 = "${TUNE_FEATURES:tune-armv7a} vfpv4d16"
33TUNE_FEATURES_tune-armv7at-vfpv4d16 = "${TUNE_FEATURES_tune-armv7at} vfpv4d16" 33TUNE_FEATURES:tune-armv7at-vfpv4d16 = "${TUNE_FEATURES:tune-armv7at} vfpv4d16"
34TUNE_FEATURES_tune-armv7a-neon = "${TUNE_FEATURES_tune-armv7a} neon" 34TUNE_FEATURES:tune-armv7a-neon = "${TUNE_FEATURES:tune-armv7a} neon"
35TUNE_FEATURES_tune-armv7at-neon = "${TUNE_FEATURES_tune-armv7at} neon" 35TUNE_FEATURES:tune-armv7at-neon = "${TUNE_FEATURES:tune-armv7at} neon"
36TUNE_FEATURES_tune-armv7a-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7a-neon} vfpv4" 36TUNE_FEATURES:tune-armv7a-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7a-neon} vfpv4"
37TUNE_FEATURES_tune-armv7at-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7at-neon} vfpv4" 37TUNE_FEATURES:tune-armv7at-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7at-neon} vfpv4"
38PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7a armv7a-vfp" 38PACKAGE_EXTRA_ARCHS:tune-armv7a = "${PACKAGE_EXTRA_ARCHS:tune-armv6} armv7a armv7a-vfp"
39PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7a armv7a-vfp armv7at2-vfp" 39PACKAGE_EXTRA_ARCHS:tune-armv7at = "${PACKAGE_EXTRA_ARCHS:tune-armv6t} armv7a armv7a-vfp armv7at2-vfp"
40PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfpv3d16" 40PACKAGE_EXTRA_ARCHS:tune-armv7a-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} armv7a-vfpv3d16"
41PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfpv3d16 armv7at2-vfpv3d16" 41PACKAGE_EXTRA_ARCHS:tune-armv7at-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7a-vfpv3d16 armv7at2-vfpv3d16"
42PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3d16} armv7a-vfpv3" 42PACKAGE_EXTRA_ARCHS:tune-armv7a-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-vfpv3d16} armv7a-vfpv3"
43PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3d16} armv7a-vfpv3 armv7at2-vfpv3" 43PACKAGE_EXTRA_ARCHS:tune-armv7at-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-vfpv3d16} armv7a-vfpv3 armv7at2-vfpv3"
44PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfpv4d16" 44PACKAGE_EXTRA_ARCHS:tune-armv7a-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} armv7a-vfpv4d16"
45PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfpv4d16 armv7at2-vfpv4d16" 45PACKAGE_EXTRA_ARCHS:tune-armv7at-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7a-vfpv4d16 armv7at2-vfpv4d16"
46PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-neon" 46PACKAGE_EXTRA_ARCHS:tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} armv7a-neon"
47PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-neon armv7at2-neon" 47PACKAGE_EXTRA_ARCHS:tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7a-neon armv7at2-neon"
48PACKAGE_EXTRA_ARCHS_tune-armv7a-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} armv7a-neon-vfpv4" 48PACKAGE_EXTRA_ARCHS:tune-armv7a-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-neon} armv7a-neon-vfpv4"
49PACKAGE_EXTRA_ARCHS_tune-armv7at-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} armv7a-neon-vfpv4 armv7at2-neon-vfpv4" 49PACKAGE_EXTRA_ARCHS:tune-armv7at-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-neon} armv7a-neon-vfpv4 armv7at2-neon-vfpv4"
50 50
51# HF Tunes 51# HF Tunes
52AVAILTUNES += "armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4" 52AVAILTUNES += "armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4"
53ARMPKGARCH_tune-armv7ahf ?= "armv7a" 53ARMPKGARCH:tune-armv7ahf ?= "armv7a"
54ARMPKGARCH_tune-armv7athf ?= "armv7a" 54ARMPKGARCH:tune-armv7athf ?= "armv7a"
55ARMPKGARCH_tune-armv7ahf-vfpv3d16 ?= "armv7a" 55ARMPKGARCH:tune-armv7ahf-vfpv3d16 ?= "armv7a"
56ARMPKGARCH_tune-armv7athf-vfpv3d16 ?= "armv7a" 56ARMPKGARCH:tune-armv7athf-vfpv3d16 ?= "armv7a"
57ARMPKGARCH_tune-armv7ahf-vfpv3 ?= "armv7a" 57ARMPKGARCH:tune-armv7ahf-vfpv3 ?= "armv7a"
58ARMPKGARCH_tune-armv7athf-vfpv3 ?= "armv7a" 58ARMPKGARCH:tune-armv7athf-vfpv3 ?= "armv7a"
59ARMPKGARCH_tune-armv7ahf-vfpv4d16 ?= "armv7a" 59ARMPKGARCH:tune-armv7ahf-vfpv4d16 ?= "armv7a"
60ARMPKGARCH_tune-armv7athf-vfpv4d16 ?= "armv7a" 60ARMPKGARCH:tune-armv7athf-vfpv4d16 ?= "armv7a"
61ARMPKGARCH_tune-armv7ahf-neon ?= "armv7a" 61ARMPKGARCH:tune-armv7ahf-neon ?= "armv7a"
62ARMPKGARCH_tune-armv7athf-neon ?= "armv7a" 62ARMPKGARCH:tune-armv7athf-neon ?= "armv7a"
63ARMPKGARCH_tune-armv7ahf-neon-vfpv4 ?= "armv7a" 63ARMPKGARCH:tune-armv7ahf-neon-vfpv4 ?= "armv7a"
64ARMPKGARCH_tune-armv7athf-neon-vfpv4 ?= "armv7a" 64ARMPKGARCH:tune-armv7athf-neon-vfpv4 ?= "armv7a"
65TUNE_FEATURES_tune-armv7ahf = "${TUNE_FEATURES_tune-armv7a} callconvention-hard" 65TUNE_FEATURES:tune-armv7ahf = "${TUNE_FEATURES:tune-armv7a} callconvention-hard"
66TUNE_FEATURES_tune-armv7athf = "${TUNE_FEATURES_tune-armv7at} callconvention-hard" 66TUNE_FEATURES:tune-armv7athf = "${TUNE_FEATURES:tune-armv7at} callconvention-hard"
67TUNE_FEATURES_tune-armv7ahf-vfpv3d16 = "${TUNE_FEATURES_tune-armv7a-vfpv3d16} callconvention-hard" 67TUNE_FEATURES:tune-armv7ahf-vfpv3d16 = "${TUNE_FEATURES:tune-armv7a-vfpv3d16} callconvention-hard"
68TUNE_FEATURES_tune-armv7athf-vfpv3d16 = "${TUNE_FEATURES_tune-armv7at-vfpv3d16} callconvention-hard" 68TUNE_FEATURES:tune-armv7athf-vfpv3d16 = "${TUNE_FEATURES:tune-armv7at-vfpv3d16} callconvention-hard"
69TUNE_FEATURES_tune-armv7ahf-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3} callconvention-hard" 69TUNE_FEATURES:tune-armv7ahf-vfpv3 = "${TUNE_FEATURES:tune-armv7a-vfpv3} callconvention-hard"
70TUNE_FEATURES_tune-armv7athf-vfpv3 = "${TUNE_FEATURES_tune-armv7at-vfpv3} callconvention-hard" 70TUNE_FEATURES:tune-armv7athf-vfpv3 = "${TUNE_FEATURES:tune-armv7at-vfpv3} callconvention-hard"
71TUNE_FEATURES_tune-armv7ahf-vfpv4d16 = "${TUNE_FEATURES_tune-armv7a-vfpv4d16} callconvention-hard" 71TUNE_FEATURES:tune-armv7ahf-vfpv4d16 = "${TUNE_FEATURES:tune-armv7a-vfpv4d16} callconvention-hard"
72TUNE_FEATURES_tune-armv7athf-vfpv4d16 = "${TUNE_FEATURES_tune-armv7at-vfpv4d16} callconvention-hard" 72TUNE_FEATURES:tune-armv7athf-vfpv4d16 = "${TUNE_FEATURES:tune-armv7at-vfpv4d16} callconvention-hard"
73TUNE_FEATURES_tune-armv7ahf-neon = "${TUNE_FEATURES_tune-armv7a-neon} callconvention-hard" 73TUNE_FEATURES:tune-armv7ahf-neon = "${TUNE_FEATURES:tune-armv7a-neon} callconvention-hard"
74TUNE_FEATURES_tune-armv7athf-neon = "${TUNE_FEATURES_tune-armv7at-neon} callconvention-hard" 74TUNE_FEATURES:tune-armv7athf-neon = "${TUNE_FEATURES:tune-armv7at-neon} callconvention-hard"
75TUNE_FEATURES_tune-armv7ahf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7a-neon-vfpv4} callconvention-hard" 75TUNE_FEATURES:tune-armv7ahf-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7a-neon-vfpv4} callconvention-hard"
76TUNE_FEATURES_tune-armv7athf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7at-neon-vfpv4} callconvention-hard" 76TUNE_FEATURES:tune-armv7athf-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7at-neon-vfpv4} callconvention-hard"
77PACKAGE_EXTRA_ARCHS_tune-armv7ahf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} armv7ahf-vfp" 77PACKAGE_EXTRA_ARCHS:tune-armv7ahf = "${PACKAGE_EXTRA_ARCHS:tune-armv6hf} armv7ahf-vfp"
78PACKAGE_EXTRA_ARCHS_tune-armv7athf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7ahf-vfp armv7at2hf-vfp" 78PACKAGE_EXTRA_ARCHS:tune-armv7athf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} armv7ahf-vfp armv7at2hf-vfp"
79PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} armv7ahf-vfpv3d16" 79PACKAGE_EXTRA_ARCHS:tune-armv7ahf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} armv7ahf-vfpv3d16"
80PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16" 80PACKAGE_EXTRA_ARCHS:tune-armv7athf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16"
81PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3d16} armv7ahf-vfpv3" 81PACKAGE_EXTRA_ARCHS:tune-armv7ahf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-vfpv3d16} armv7ahf-vfpv3"
82PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv3d16} armv7ahf-vfpv3 armv7at2hf-vfpv3" 82PACKAGE_EXTRA_ARCHS:tune-armv7athf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-vfpv3d16} armv7ahf-vfpv3 armv7at2hf-vfpv3"
83PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} armv7ahf-vfpv4d16" 83PACKAGE_EXTRA_ARCHS:tune-armv7ahf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} armv7ahf-vfpv4d16"
84PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16" 84PACKAGE_EXTRA_ARCHS:tune-armv7athf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16"
85PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} armv7ahf-neon" 85PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} armv7ahf-neon"
86PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} armv7ahf-neon armv7at2hf-neon" 86PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} armv7ahf-neon armv7at2hf-neon"
87PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} armv7ahf-neon-vfpv4" 87PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon} armv7ahf-neon-vfpv4"
88PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4" 88PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon} armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4"
89 89
90# Big Endian 90# Big Endian
91AVAILTUNES += "armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4" 91AVAILTUNES += "armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4"
92ARMPKGARCH_tune-armv7ab ?= "armv7a" 92ARMPKGARCH:tune-armv7ab ?= "armv7a"
93ARMPKGARCH_tune-armv7atb ?= "armv7a" 93ARMPKGARCH:tune-armv7atb ?= "armv7a"
94ARMPKGARCH_tune-armv7ab-vfpv3d16 ?= "armv7a" 94ARMPKGARCH:tune-armv7ab-vfpv3d16 ?= "armv7a"
95ARMPKGARCH_tune-armv7atb-vfpv3d16 ?= "armv7a" 95ARMPKGARCH:tune-armv7atb-vfpv3d16 ?= "armv7a"
96ARMPKGARCH_tune-armv7ab-vfpv3 ?= "armv7a" 96ARMPKGARCH:tune-armv7ab-vfpv3 ?= "armv7a"
97ARMPKGARCH_tune-armv7atb-vfpv3 ?= "armv7a" 97ARMPKGARCH:tune-armv7atb-vfpv3 ?= "armv7a"
98ARMPKGARCH_tune-armv7ab-vfpv4d16 ?= "armv7a" 98ARMPKGARCH:tune-armv7ab-vfpv4d16 ?= "armv7a"
99ARMPKGARCH_tune-armv7atb-vfpv4d16 ?= "armv7a" 99ARMPKGARCH:tune-armv7atb-vfpv4d16 ?= "armv7a"
100ARMPKGARCH_tune-armv7ab-neon ?= "armv7a" 100ARMPKGARCH:tune-armv7ab-neon ?= "armv7a"
101ARMPKGARCH_tune-armv7atb-neon ?= "armv7a" 101ARMPKGARCH:tune-armv7atb-neon ?= "armv7a"
102ARMPKGARCH_tune-armv7ab-neon-vfpv4 ?= "armv7a" 102ARMPKGARCH:tune-armv7ab-neon-vfpv4 ?= "armv7a"
103ARMPKGARCH_tune-armv7atb-neon-vfpv4 ?= "armv7a" 103ARMPKGARCH:tune-armv7atb-neon-vfpv4 ?= "armv7a"
104TUNE_FEATURES_tune-armv7ab = "${TUNE_FEATURES_tune-armv7a} bigendian" 104TUNE_FEATURES:tune-armv7ab = "${TUNE_FEATURES:tune-armv7a} bigendian"
105TUNE_FEATURES_tune-armv7atb = "${TUNE_FEATURES_tune-armv7at} bigendian" 105TUNE_FEATURES:tune-armv7atb = "${TUNE_FEATURES:tune-armv7at} bigendian"
106TUNE_FEATURES_tune-armv7ab-vfpv3d16 = "${TUNE_FEATURES_tune-armv7a-vfpv3d16} bigendian" 106TUNE_FEATURES:tune-armv7ab-vfpv3d16 = "${TUNE_FEATURES:tune-armv7a-vfpv3d16} bigendian"
107TUNE_FEATURES_tune-armv7atb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7at-vfpv3d16} bigendian" 107TUNE_FEATURES:tune-armv7atb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7at-vfpv3d16} bigendian"
108TUNE_FEATURES_tune-armv7ab-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3} bigendian" 108TUNE_FEATURES:tune-armv7ab-vfpv3 = "${TUNE_FEATURES:tune-armv7a-vfpv3} bigendian"
109TUNE_FEATURES_tune-armv7atb-vfpv3 = "${TUNE_FEATURES_tune-armv7at-vfpv3} bigendian" 109TUNE_FEATURES:tune-armv7atb-vfpv3 = "${TUNE_FEATURES:tune-armv7at-vfpv3} bigendian"
110TUNE_FEATURES_tune-armv7ab-vfpv4d16 = "${TUNE_FEATURES_tune-armv7a-vfpv4d16} bigendian" 110TUNE_FEATURES:tune-armv7ab-vfpv4d16 = "${TUNE_FEATURES:tune-armv7a-vfpv4d16} bigendian"
111TUNE_FEATURES_tune-armv7atb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7at-vfpv4d16} bigendian" 111TUNE_FEATURES:tune-armv7atb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7at-vfpv4d16} bigendian"
112TUNE_FEATURES_tune-armv7ab-neon = "${TUNE_FEATURES_tune-armv7a-neon} bigendian" 112TUNE_FEATURES:tune-armv7ab-neon = "${TUNE_FEATURES:tune-armv7a-neon} bigendian"
113TUNE_FEATURES_tune-armv7atb-neon = "${TUNE_FEATURES_tune-armv7at-neon} bigendian" 113TUNE_FEATURES:tune-armv7atb-neon = "${TUNE_FEATURES:tune-armv7at-neon} bigendian"
114TUNE_FEATURES_tune-armv7ab-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7a-neon-vfpv4} bigendian" 114TUNE_FEATURES:tune-armv7ab-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7a-neon-vfpv4} bigendian"
115TUNE_FEATURES_tune-armv7atb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7at-neon-vfpv4} bigendian" 115TUNE_FEATURES:tune-armv7atb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7at-neon-vfpv4} bigendian"
116PACKAGE_EXTRA_ARCHS_tune-armv7ab = "${PACKAGE_EXTRA_ARCHS_tune-armv6b} armv7ab-vfp" 116PACKAGE_EXTRA_ARCHS:tune-armv7ab = "${PACKAGE_EXTRA_ARCHS:tune-armv6b} armv7ab-vfp"
117PACKAGE_EXTRA_ARCHS_tune-armv7atb = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb} armv7ab-vfp armv7at2b-vfp" 117PACKAGE_EXTRA_ARCHS:tune-armv7atb = "${PACKAGE_EXTRA_ARCHS:tune-armv6tb} armv7ab-vfp armv7at2b-vfp"
118PACKAGE_EXTRA_ARCHS_tune-armv7ab-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab} armv7ab-vfpv3d16" 118PACKAGE_EXTRA_ARCHS:tune-armv7ab-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab} armv7ab-vfpv3d16"
119PACKAGE_EXTRA_ARCHS_tune-armv7atb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb} armv7ab-vfpv3d16 armv7at2b-vfpv3d16" 119PACKAGE_EXTRA_ARCHS:tune-armv7atb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb} armv7ab-vfpv3d16 armv7at2b-vfpv3d16"
120PACKAGE_EXTRA_ARCHS_tune-armv7ab-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab-vfpv3d16} armv7ab-vfpv3" 120PACKAGE_EXTRA_ARCHS:tune-armv7ab-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab-vfpv3d16} armv7ab-vfpv3"
121PACKAGE_EXTRA_ARCHS_tune-armv7atb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb-vfpv3d16} armv7ab-vfpv3 armv7at2b-vfpv3" 121PACKAGE_EXTRA_ARCHS:tune-armv7atb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb-vfpv3d16} armv7ab-vfpv3 armv7at2b-vfpv3"
122PACKAGE_EXTRA_ARCHS_tune-armv7ab-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab} armv7ab-vfpv4d16" 122PACKAGE_EXTRA_ARCHS:tune-armv7ab-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab} armv7ab-vfpv4d16"
123PACKAGE_EXTRA_ARCHS_tune-armv7atb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb} armv7ab-vfpv4d16 armv7at2b-vfpv4d16" 123PACKAGE_EXTRA_ARCHS:tune-armv7atb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb} armv7ab-vfpv4d16 armv7at2b-vfpv4d16"
124PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab} armv7ab-neon" 124PACKAGE_EXTRA_ARCHS:tune-armv7ab-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab} armv7ab-neon"
125PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb} armv7ab-neon armv7at2b-neon" 125PACKAGE_EXTRA_ARCHS:tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb} armv7ab-neon armv7at2b-neon"
126PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon} armv7ab-neon-vfpv4" 126PACKAGE_EXTRA_ARCHS:tune-armv7ab-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab-neon} armv7ab-neon-vfpv4"
127PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon} armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4" 127PACKAGE_EXTRA_ARCHS:tune-armv7atb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb-neon} armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4"
128 128
129# Big Endian + HF 129# Big Endian + HF
130AVAILTUNES += "armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4" 130AVAILTUNES += "armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4"
131ARMPKGARCH_tune-armv7ahfb ?= "armv7a" 131ARMPKGARCH:tune-armv7ahfb ?= "armv7a"
132ARMPKGARCH_tune-armv7athfb ?= "armv7a" 132ARMPKGARCH:tune-armv7athfb ?= "armv7a"
133ARMPKGARCH_tune-armv7ahfb-vfpv3d16 ?= "armv7a" 133ARMPKGARCH:tune-armv7ahfb-vfpv3d16 ?= "armv7a"
134ARMPKGARCH_tune-armv7athfb-vfpv3d16 ?= "armv7a" 134ARMPKGARCH:tune-armv7athfb-vfpv3d16 ?= "armv7a"
135ARMPKGARCH_tune-armv7ahfb-vfpv3 ?= "armv7a" 135ARMPKGARCH:tune-armv7ahfb-vfpv3 ?= "armv7a"
136ARMPKGARCH_tune-armv7athfb-vfpv3 ?= "armv7a" 136ARMPKGARCH:tune-armv7athfb-vfpv3 ?= "armv7a"
137ARMPKGARCH_tune-armv7ahfb-vfpv4d16 ?= "armv7a" 137ARMPKGARCH:tune-armv7ahfb-vfpv4d16 ?= "armv7a"
138ARMPKGARCH_tune-armv7athfb-vfpv4d16 ?= "armv7a" 138ARMPKGARCH:tune-armv7athfb-vfpv4d16 ?= "armv7a"
139ARMPKGARCH_tune-armv7ahfb-neon ?= "armv7a" 139ARMPKGARCH:tune-armv7ahfb-neon ?= "armv7a"
140ARMPKGARCH_tune-armv7athfb-neon ?= "armv7a" 140ARMPKGARCH:tune-armv7athfb-neon ?= "armv7a"
141ARMPKGARCH_tune-armv7ahfb-neon-vfpv4 ?= "armv7a" 141ARMPKGARCH:tune-armv7ahfb-neon-vfpv4 ?= "armv7a"
142ARMPKGARCH_tune-armv7athfb-neon-vfpv4 ?= "armv7a" 142ARMPKGARCH:tune-armv7athfb-neon-vfpv4 ?= "armv7a"
143TUNE_FEATURES_tune-armv7ahfb = "${TUNE_FEATURES_tune-armv7ahf} bigendian" 143TUNE_FEATURES:tune-armv7ahfb = "${TUNE_FEATURES:tune-armv7ahf} bigendian"
144TUNE_FEATURES_tune-armv7athfb = "${TUNE_FEATURES_tune-armv7athf} bigendian" 144TUNE_FEATURES:tune-armv7athfb = "${TUNE_FEATURES:tune-armv7athf} bigendian"
145TUNE_FEATURES_tune-armv7ahfb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7ahf-vfpv3d16} bigendian" 145TUNE_FEATURES:tune-armv7ahfb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7ahf-vfpv3d16} bigendian"
146TUNE_FEATURES_tune-armv7athfb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7athf-vfpv3d16} bigendian" 146TUNE_FEATURES:tune-armv7athfb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7athf-vfpv3d16} bigendian"
147TUNE_FEATURES_tune-armv7ahfb-vfpv3 = "${TUNE_FEATURES_tune-armv7ahf-vfpv3} bigendian" 147TUNE_FEATURES:tune-armv7ahfb-vfpv3 = "${TUNE_FEATURES:tune-armv7ahf-vfpv3} bigendian"
148TUNE_FEATURES_tune-armv7athfb-vfpv3 = "${TUNE_FEATURES_tune-armv7athf-vfpv3} bigendian" 148TUNE_FEATURES:tune-armv7athfb-vfpv3 = "${TUNE_FEATURES:tune-armv7athf-vfpv3} bigendian"
149TUNE_FEATURES_tune-armv7ahfb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7ahf-vfpv4d16} bigendian" 149TUNE_FEATURES:tune-armv7ahfb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7ahf-vfpv4d16} bigendian"
150TUNE_FEATURES_tune-armv7athfb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7athf-vfpv4d16} bigendian" 150TUNE_FEATURES:tune-armv7athfb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7athf-vfpv4d16} bigendian"
151TUNE_FEATURES_tune-armv7ahfb-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} bigendian" 151TUNE_FEATURES:tune-armv7ahfb-neon = "${TUNE_FEATURES:tune-armv7ahf-neon} bigendian"
152TUNE_FEATURES_tune-armv7athfb-neon = "${TUNE_FEATURES_tune-armv7athf-neon} bigendian" 152TUNE_FEATURES:tune-armv7athfb-neon = "${TUNE_FEATURES:tune-armv7athf-neon} bigendian"
153TUNE_FEATURES_tune-armv7ahfb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ahf-neon-vfpv4} bigendian" 153TUNE_FEATURES:tune-armv7ahfb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7ahf-neon-vfpv4} bigendian"
154TUNE_FEATURES_tune-armv7athfb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7athf-neon-vfpv4} bigendian" 154TUNE_FEATURES:tune-armv7athfb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7athf-neon-vfpv4} bigendian"
155PACKAGE_EXTRA_ARCHS_tune-armv7ahfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6hfb} armv7ahfb-vfp" 155PACKAGE_EXTRA_ARCHS:tune-armv7ahfb = "${PACKAGE_EXTRA_ARCHS:tune-armv6hfb} armv7ahfb-vfp"
156PACKAGE_EXTRA_ARCHS_tune-armv7athfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6thfb} armv7ahfb-vfp armv7at2hfb-vfp" 156PACKAGE_EXTRA_ARCHS:tune-armv7athfb = "${PACKAGE_EXTRA_ARCHS:tune-armv6thfb} armv7ahfb-vfp armv7at2hfb-vfp"
157PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb} armv7ahfb-vfpv3d16" 157PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb} armv7ahfb-vfpv3d16"
158PACKAGE_EXTRA_ARCHS_tune-armv7athfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb} armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16" 158PACKAGE_EXTRA_ARCHS:tune-armv7athfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb} armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16"
159PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-vfpv3d16} armv7ahfb-vfpv3" 159PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-vfpv3d16} armv7ahfb-vfpv3"
160PACKAGE_EXTRA_ARCHS_tune-armv7athfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb-vfpv3d16} armv7ahfb-vfpv3 armv7at2hfb-vfpv3" 160PACKAGE_EXTRA_ARCHS:tune-armv7athfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb-vfpv3d16} armv7ahfb-vfpv3 armv7at2hfb-vfpv3"
161PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb} armv7ahfb-vfpv4d16" 161PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb} armv7ahfb-vfpv4d16"
162PACKAGE_EXTRA_ARCHS_tune-armv7athfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb} armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16" 162PACKAGE_EXTRA_ARCHS:tune-armv7athfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb} armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16"
163PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb} armv7ahfb-neon" 163PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb} armv7ahfb-neon"
164PACKAGE_EXTRA_ARCHS_tune-armv7athfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb} armv7ahfb-neon armv7at2hfb-neon" 164PACKAGE_EXTRA_ARCHS:tune-armv7athfb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb} armv7ahfb-neon armv7at2hfb-neon"
165PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb-neon} armv7ahfb-neon-vfpv4" 165PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb-neon} armv7ahfb-neon-vfpv4"
166PACKAGE_EXTRA_ARCHS_tune-armv7athfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb-neon} armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4" 166PACKAGE_EXTRA_ARCHS:tune-armv7athfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb-neon} armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4"
diff --git a/meta/conf/machine/include/arm/arch-armv7ve.inc b/meta/conf/machine/include/arm/arch-armv7ve.inc
index d9d92f612b..b40c2ca8ad 100644
--- a/meta/conf/machine/include/arm/arch-armv7ve.inc
+++ b/meta/conf/machine/include/arm/arch-armv7ve.inc
@@ -9,156 +9,156 @@ require conf/machine/include/arm/arch-armv7a.inc
9 9
10# Little Endian base configs 10# Little Endian base configs
11AVAILTUNES += "armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4" 11AVAILTUNES += "armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4"
12ARMPKGARCH_tune-armv7ve ?= "armv7ve" 12ARMPKGARCH:tune-armv7ve ?= "armv7ve"
13ARMPKGARCH_tune-armv7vet ?= "armv7ve" 13ARMPKGARCH:tune-armv7vet ?= "armv7ve"
14ARMPKGARCH_tune-armv7ve-vfpv3d16 ?= "armv7ve" 14ARMPKGARCH:tune-armv7ve-vfpv3d16 ?= "armv7ve"
15ARMPKGARCH_tune-armv7vet-vfpv3d16 ?= "armv7ve" 15ARMPKGARCH:tune-armv7vet-vfpv3d16 ?= "armv7ve"
16ARMPKGARCH_tune-armv7ve-vfpv3 ?= "armv7ve" 16ARMPKGARCH:tune-armv7ve-vfpv3 ?= "armv7ve"
17ARMPKGARCH_tune-armv7vet-vfpv3 ?= "armv7ve" 17ARMPKGARCH:tune-armv7vet-vfpv3 ?= "armv7ve"
18ARMPKGARCH_tune-armv7ve-vfpv4d16 ?= "armv7ve" 18ARMPKGARCH:tune-armv7ve-vfpv4d16 ?= "armv7ve"
19ARMPKGARCH_tune-armv7vet-vfpv4d16 ?= "armv7ve" 19ARMPKGARCH:tune-armv7vet-vfpv4d16 ?= "armv7ve"
20ARMPKGARCH_tune-armv7ve-neon ?= "armv7ve" 20ARMPKGARCH:tune-armv7ve-neon ?= "armv7ve"
21ARMPKGARCH_tune-armv7vet-neon ?= "armv7ve" 21ARMPKGARCH:tune-armv7vet-neon ?= "armv7ve"
22ARMPKGARCH_tune-armv7ve-neon-vfpv4 ?= "armv7ve" 22ARMPKGARCH:tune-armv7ve-neon-vfpv4 ?= "armv7ve"
23ARMPKGARCH_tune-armv7vet-neon-vfpv4 ?= "armv7ve" 23ARMPKGARCH:tune-armv7vet-neon-vfpv4 ?= "armv7ve"
24TUNE_FEATURES_tune-armv7ve = "arm armv7ve vfp" 24TUNE_FEATURES:tune-armv7ve = "arm armv7ve vfp"
25TUNE_FEATURES_tune-armv7vet = "${TUNE_FEATURES_tune-armv7ve} thumb" 25TUNE_FEATURES:tune-armv7vet = "${TUNE_FEATURES:tune-armv7ve} thumb"
26TUNE_FEATURES_tune-armv7ve-vfpv3d16 = "${TUNE_FEATURES_tune-armv7ve} vfpv3d16" 26TUNE_FEATURES:tune-armv7ve-vfpv3d16 = "${TUNE_FEATURES:tune-armv7ve} vfpv3d16"
27TUNE_FEATURES_tune-armv7vet-vfpv3d16 = "${TUNE_FEATURES_tune-armv7vet} vfpv3d16" 27TUNE_FEATURES:tune-armv7vet-vfpv3d16 = "${TUNE_FEATURES:tune-armv7vet} vfpv3d16"
28TUNE_FEATURES_tune-armv7ve-vfpv3 = "${TUNE_FEATURES_tune-armv7ve-vfpv3d16} vfpv3" 28TUNE_FEATURES:tune-armv7ve-vfpv3 = "${TUNE_FEATURES:tune-armv7ve-vfpv3d16} vfpv3"
29TUNE_FEATURES_tune-armv7vet-vfpv3 = "${TUNE_FEATURES_tune-armv7vet-vfpv3d16} vfpv3" 29TUNE_FEATURES:tune-armv7vet-vfpv3 = "${TUNE_FEATURES:tune-armv7vet-vfpv3d16} vfpv3"
30TUNE_FEATURES_tune-armv7ve-vfpv4d16 = "${TUNE_FEATURES_tune-armv7ve} vfpv4d16" 30TUNE_FEATURES:tune-armv7ve-vfpv4d16 = "${TUNE_FEATURES:tune-armv7ve} vfpv4d16"
31TUNE_FEATURES_tune-armv7vet-vfpv4d16 = "${TUNE_FEATURES_tune-armv7vet} vfpv4d16" 31TUNE_FEATURES:tune-armv7vet-vfpv4d16 = "${TUNE_FEATURES:tune-armv7vet} vfpv4d16"
32TUNE_FEATURES_tune-armv7ve-neon = "${TUNE_FEATURES_tune-armv7ve} neon" 32TUNE_FEATURES:tune-armv7ve-neon = "${TUNE_FEATURES:tune-armv7ve} neon"
33TUNE_FEATURES_tune-armv7vet-neon = "${TUNE_FEATURES_tune-armv7vet} neon" 33TUNE_FEATURES:tune-armv7vet-neon = "${TUNE_FEATURES:tune-armv7vet} neon"
34TUNE_FEATURES_tune-armv7ve-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon} vfpv4" 34TUNE_FEATURES:tune-armv7ve-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7ve-neon} vfpv4"
35TUNE_FEATURES_tune-armv7vet-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon} vfpv4" 35TUNE_FEATURES:tune-armv7vet-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7vet-neon} vfpv4"
36PACKAGE_EXTRA_ARCHS_tune-armv7ve = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7ve armv7ve-vfp" 36PACKAGE_EXTRA_ARCHS:tune-armv7ve = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} armv7ve armv7ve-vfp"
37PACKAGE_EXTRA_ARCHS_tune-armv7vet = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ve armv7ve-vfp armv7vet2-vfp" 37PACKAGE_EXTRA_ARCHS:tune-armv7vet = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7ve armv7ve-vfp armv7vet2-vfp"
38PACKAGE_EXTRA_ARCHS_tune-armv7ve-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} armv7ve-vfpv3d16" 38PACKAGE_EXTRA_ARCHS:tune-armv7ve-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} armv7ve-vfpv3d16"
39PACKAGE_EXTRA_ARCHS_tune-armv7vet-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} armv7ve-vfpv3d16 armv7vet2-vfpv3d16" 39PACKAGE_EXTRA_ARCHS:tune-armv7vet-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} armv7ve-vfpv3d16 armv7vet2-vfpv3d16"
40PACKAGE_EXTRA_ARCHS_tune-armv7ve-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-vfpv3d16} armv7ve-vfpv3" 40PACKAGE_EXTRA_ARCHS:tune-armv7ve-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-vfpv3d16} armv7ve-vfpv3"
41PACKAGE_EXTRA_ARCHS_tune-armv7vet-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-vfpv3d16} armv7ve-vfpv3 armv7vet2-vfpv3" 41PACKAGE_EXTRA_ARCHS:tune-armv7vet-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-vfpv3d16} armv7ve-vfpv3 armv7vet2-vfpv3"
42PACKAGE_EXTRA_ARCHS_tune-armv7ve-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} armv7ve-vfpv4d16" 42PACKAGE_EXTRA_ARCHS:tune-armv7ve-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} armv7ve-vfpv4d16"
43PACKAGE_EXTRA_ARCHS_tune-armv7vet-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} armv7ve-vfpv4d16 armv7vet2-vfpv4d16" 43PACKAGE_EXTRA_ARCHS:tune-armv7vet-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} armv7ve-vfpv4d16 armv7vet2-vfpv4d16"
44PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} armv7ve-neon" 44PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} armv7ve-neon"
45PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} armv7ve-neon armv7vet2-neon" 45PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} armv7ve-neon armv7vet2-neon"
46PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} armv7ve-neon-vfpv4" 46PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon} armv7ve-neon-vfpv4"
47PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4" 47PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon} armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4"
48 48
49# HF Tunes 49# HF Tunes
50AVAILTUNES += "armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4" 50AVAILTUNES += "armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4"
51ARMPKGARCH_tune-armv7vehf ?= "armv7ve" 51ARMPKGARCH:tune-armv7vehf ?= "armv7ve"
52ARMPKGARCH_tune-armv7vethf ?= "armv7ve" 52ARMPKGARCH:tune-armv7vethf ?= "armv7ve"
53ARMPKGARCH_tune-armv7vehf-vfpv3d16 ?= "armv7ve" 53ARMPKGARCH:tune-armv7vehf-vfpv3d16 ?= "armv7ve"
54ARMPKGARCH_tune-armv7vethf-vfpv3d16 ?= "armv7ve" 54ARMPKGARCH:tune-armv7vethf-vfpv3d16 ?= "armv7ve"
55ARMPKGARCH_tune-armv7vehf-vfpv3 ?= "armv7ve" 55ARMPKGARCH:tune-armv7vehf-vfpv3 ?= "armv7ve"
56ARMPKGARCH_tune-armv7vethf-vfpv3 ?= "armv7ve" 56ARMPKGARCH:tune-armv7vethf-vfpv3 ?= "armv7ve"
57ARMPKGARCH_tune-armv7vehf-vfpv4d16 ?= "armv7ve" 57ARMPKGARCH:tune-armv7vehf-vfpv4d16 ?= "armv7ve"
58ARMPKGARCH_tune-armv7vethf-vfpv4d16 ?= "armv7ve" 58ARMPKGARCH:tune-armv7vethf-vfpv4d16 ?= "armv7ve"
59ARMPKGARCH_tune-armv7vehf-neon ?= "armv7ve" 59ARMPKGARCH:tune-armv7vehf-neon ?= "armv7ve"
60ARMPKGARCH_tune-armv7vethf-neon ?= "armv7ve" 60ARMPKGARCH:tune-armv7vethf-neon ?= "armv7ve"
61ARMPKGARCH_tune-armv7vehf-neon-vfpv4 ?= "armv7ve" 61ARMPKGARCH:tune-armv7vehf-neon-vfpv4 ?= "armv7ve"
62ARMPKGARCH_tune-armv7vethf-neon-vfpv4 ?= "armv7ve" 62ARMPKGARCH:tune-armv7vethf-neon-vfpv4 ?= "armv7ve"
63TUNE_FEATURES_tune-armv7vehf = "${TUNE_FEATURES_tune-armv7ve} callconvention-hard" 63TUNE_FEATURES:tune-armv7vehf = "${TUNE_FEATURES:tune-armv7ve} callconvention-hard"
64TUNE_FEATURES_tune-armv7vethf = "${TUNE_FEATURES_tune-armv7vet} callconvention-hard" 64TUNE_FEATURES:tune-armv7vethf = "${TUNE_FEATURES:tune-armv7vet} callconvention-hard"
65TUNE_FEATURES_tune-armv7vehf-vfpv3d16 = "${TUNE_FEATURES_tune-armv7ve-vfpv3d16} callconvention-hard" 65TUNE_FEATURES:tune-armv7vehf-vfpv3d16 = "${TUNE_FEATURES:tune-armv7ve-vfpv3d16} callconvention-hard"
66TUNE_FEATURES_tune-armv7vethf-vfpv3d16 = "${TUNE_FEATURES_tune-armv7vet-vfpv3d16} callconvention-hard" 66TUNE_FEATURES:tune-armv7vethf-vfpv3d16 = "${TUNE_FEATURES:tune-armv7vet-vfpv3d16} callconvention-hard"
67TUNE_FEATURES_tune-armv7vehf-vfpv3 = "${TUNE_FEATURES_tune-armv7ve-vfpv3} callconvention-hard" 67TUNE_FEATURES:tune-armv7vehf-vfpv3 = "${TUNE_FEATURES:tune-armv7ve-vfpv3} callconvention-hard"
68TUNE_FEATURES_tune-armv7vethf-vfpv3 = "${TUNE_FEATURES_tune-armv7vet-vfpv3} callconvention-hard" 68TUNE_FEATURES:tune-armv7vethf-vfpv3 = "${TUNE_FEATURES:tune-armv7vet-vfpv3} callconvention-hard"
69TUNE_FEATURES_tune-armv7vehf-vfpv4d16 = "${TUNE_FEATURES_tune-armv7ve-vfpv4d16} callconvention-hard" 69TUNE_FEATURES:tune-armv7vehf-vfpv4d16 = "${TUNE_FEATURES:tune-armv7ve-vfpv4d16} callconvention-hard"
70TUNE_FEATURES_tune-armv7vethf-vfpv4d16 = "${TUNE_FEATURES_tune-armv7vet-vfpv4d16} callconvention-hard" 70TUNE_FEATURES:tune-armv7vethf-vfpv4d16 = "${TUNE_FEATURES:tune-armv7vet-vfpv4d16} callconvention-hard"
71TUNE_FEATURES_tune-armv7vehf-neon = "${TUNE_FEATURES_tune-armv7ve-neon} callconvention-hard" 71TUNE_FEATURES:tune-armv7vehf-neon = "${TUNE_FEATURES:tune-armv7ve-neon} callconvention-hard"
72TUNE_FEATURES_tune-armv7vethf-neon = "${TUNE_FEATURES_tune-armv7vet-neon} callconvention-hard" 72TUNE_FEATURES:tune-armv7vethf-neon = "${TUNE_FEATURES:tune-armv7vet-neon} callconvention-hard"
73TUNE_FEATURES_tune-armv7vehf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} callconvention-hard" 73TUNE_FEATURES:tune-armv7vehf-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7ve-neon-vfpv4} callconvention-hard"
74TUNE_FEATURES_tune-armv7vethf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon-vfpv4} callconvention-hard" 74TUNE_FEATURES:tune-armv7vethf-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7vet-neon-vfpv4} callconvention-hard"
75PACKAGE_EXTRA_ARCHS_tune-armv7vehf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} armv7vehf-vfp" 75PACKAGE_EXTRA_ARCHS:tune-armv7vehf = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} armv7vehf-vfp"
76PACKAGE_EXTRA_ARCHS_tune-armv7vethf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} armv7vehf-vfp armv7vet2hf-vfp" 76PACKAGE_EXTRA_ARCHS:tune-armv7vethf = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} armv7vehf-vfp armv7vet2hf-vfp"
77PACKAGE_EXTRA_ARCHS_tune-armv7vehf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} armv7vehf-vfpv3d16" 77PACKAGE_EXTRA_ARCHS:tune-armv7vehf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} armv7vehf-vfpv3d16"
78PACKAGE_EXTRA_ARCHS_tune-armv7vethf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16" 78PACKAGE_EXTRA_ARCHS:tune-armv7vethf-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16"
79PACKAGE_EXTRA_ARCHS_tune-armv7vehf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-vfpv3d16} armv7vehf-vfpv3" 79PACKAGE_EXTRA_ARCHS:tune-armv7vehf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-vfpv3d16} armv7vehf-vfpv3"
80PACKAGE_EXTRA_ARCHS_tune-armv7vethf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-vfpv3d16} armv7vehf-vfpv3 armv7vet2hf-vfpv3" 80PACKAGE_EXTRA_ARCHS:tune-armv7vethf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-vfpv3d16} armv7vehf-vfpv3 armv7vet2hf-vfpv3"
81PACKAGE_EXTRA_ARCHS_tune-armv7vehf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} armv7vehf-vfpv4d16" 81PACKAGE_EXTRA_ARCHS:tune-armv7vehf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} armv7vehf-vfpv4d16"
82PACKAGE_EXTRA_ARCHS_tune-armv7vethf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16" 82PACKAGE_EXTRA_ARCHS:tune-armv7vethf-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16"
83PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} armv7vehf-neon" 83PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} armv7vehf-neon"
84PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} armv7vehf-neon armv7vet2hf-neon" 84PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} armv7vehf-neon armv7vet2hf-neon"
85PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} armv7vehf-neon-vfpv4" 85PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon} armv7vehf-neon-vfpv4"
86PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4" 86PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon} armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4"
87 87
88# Big Endian 88# Big Endian
89AVAILTUNES += "armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4" 89AVAILTUNES += "armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4"
90ARMPKGARCH_tune-armv7veb ?= "armv7ve" 90ARMPKGARCH:tune-armv7veb ?= "armv7ve"
91ARMPKGARCH_tune-armv7vetb ?= "armv7ve" 91ARMPKGARCH:tune-armv7vetb ?= "armv7ve"
92ARMPKGARCH_tune-armv7veb-vfpv3d16 ?= "armv7ve" 92ARMPKGARCH:tune-armv7veb-vfpv3d16 ?= "armv7ve"
93ARMPKGARCH_tune-armv7vetb-vfpv3d16 ?= "armv7ve" 93ARMPKGARCH:tune-armv7vetb-vfpv3d16 ?= "armv7ve"
94ARMPKGARCH_tune-armv7veb-vfpv3 ?= "armv7ve" 94ARMPKGARCH:tune-armv7veb-vfpv3 ?= "armv7ve"
95ARMPKGARCH_tune-armv7vetb-vfpv3 ?= "armv7ve" 95ARMPKGARCH:tune-armv7vetb-vfpv3 ?= "armv7ve"
96ARMPKGARCH_tune-armv7veb-vfpv4d16 ?= "armv7ve" 96ARMPKGARCH:tune-armv7veb-vfpv4d16 ?= "armv7ve"
97ARMPKGARCH_tune-armv7vetb-vfpv4d16 ?= "armv7ve" 97ARMPKGARCH:tune-armv7vetb-vfpv4d16 ?= "armv7ve"
98ARMPKGARCH_tune-armv7veb-neon ?= "armv7ve" 98ARMPKGARCH:tune-armv7veb-neon ?= "armv7ve"
99ARMPKGARCH_tune-armv7vetb-neon ?= "armv7ve" 99ARMPKGARCH:tune-armv7vetb-neon ?= "armv7ve"
100ARMPKGARCH_tune-armv7veb-neon-vfpv4 ?= "armv7ve" 100ARMPKGARCH:tune-armv7veb-neon-vfpv4 ?= "armv7ve"
101ARMPKGARCH_tune-armv7vetb-neon-vfpv4 ?= "armv7ve" 101ARMPKGARCH:tune-armv7vetb-neon-vfpv4 ?= "armv7ve"
102TUNE_FEATURES_tune-armv7veb = "${TUNE_FEATURES_tune-armv7ve} bigendian" 102TUNE_FEATURES:tune-armv7veb = "${TUNE_FEATURES:tune-armv7ve} bigendian"
103TUNE_FEATURES_tune-armv7vetb = "${TUNE_FEATURES_tune-armv7vet} bigendian" 103TUNE_FEATURES:tune-armv7vetb = "${TUNE_FEATURES:tune-armv7vet} bigendian"
104TUNE_FEATURES_tune-armv7veb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7ve-vfpv3d16} bigendian" 104TUNE_FEATURES:tune-armv7veb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7ve-vfpv3d16} bigendian"
105TUNE_FEATURES_tune-armv7vetb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7vet-vfpv3d16} bigendian" 105TUNE_FEATURES:tune-armv7vetb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7vet-vfpv3d16} bigendian"
106TUNE_FEATURES_tune-armv7veb-vfpv3 = "${TUNE_FEATURES_tune-armv7ve-vfpv3} bigendian" 106TUNE_FEATURES:tune-armv7veb-vfpv3 = "${TUNE_FEATURES:tune-armv7ve-vfpv3} bigendian"
107TUNE_FEATURES_tune-armv7vetb-vfpv3 = "${TUNE_FEATURES_tune-armv7vet-vfpv3} bigendian" 107TUNE_FEATURES:tune-armv7vetb-vfpv3 = "${TUNE_FEATURES:tune-armv7vet-vfpv3} bigendian"
108TUNE_FEATURES_tune-armv7veb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7ve-vfpv4d16} bigendian" 108TUNE_FEATURES:tune-armv7veb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7ve-vfpv4d16} bigendian"
109TUNE_FEATURES_tune-armv7vetb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7vet-vfpv4d16} bigendian" 109TUNE_FEATURES:tune-armv7vetb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7vet-vfpv4d16} bigendian"
110TUNE_FEATURES_tune-armv7veb-neon = "${TUNE_FEATURES_tune-armv7ve-neon} bigendian" 110TUNE_FEATURES:tune-armv7veb-neon = "${TUNE_FEATURES:tune-armv7ve-neon} bigendian"
111TUNE_FEATURES_tune-armv7vetb-neon = "${TUNE_FEATURES_tune-armv7vet-neon} bigendian" 111TUNE_FEATURES:tune-armv7vetb-neon = "${TUNE_FEATURES:tune-armv7vet-neon} bigendian"
112TUNE_FEATURES_tune-armv7veb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} bigendian" 112TUNE_FEATURES:tune-armv7veb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7ve-neon-vfpv4} bigendian"
113TUNE_FEATURES_tune-armv7vetb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon-vfpv4} bigendian" 113TUNE_FEATURES:tune-armv7vetb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7vet-neon-vfpv4} bigendian"
114PACKAGE_EXTRA_ARCHS_tune-armv7veb = "${PACKAGE_EXTRA_ARCHS_tune-armv7ab} armv7veb-vfp" 114PACKAGE_EXTRA_ARCHS:tune-armv7veb = "${PACKAGE_EXTRA_ARCHS:tune-armv7ab} armv7veb-vfp"
115PACKAGE_EXTRA_ARCHS_tune-armv7vetb = "${PACKAGE_EXTRA_ARCHS_tune-armv7atb} armv7veb-vfp armv7vet2b-vfp" 115PACKAGE_EXTRA_ARCHS:tune-armv7vetb = "${PACKAGE_EXTRA_ARCHS:tune-armv7atb} armv7veb-vfp armv7vet2b-vfp"
116PACKAGE_EXTRA_ARCHS_tune-armv7veb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7veb} armv7veb-vfpv3d16" 116PACKAGE_EXTRA_ARCHS:tune-armv7veb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7veb} armv7veb-vfpv3d16"
117PACKAGE_EXTRA_ARCHS_tune-armv7vetb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vetb} armv7veb-vfpv3d16 armv7vet2b-vfpv3d16" 117PACKAGE_EXTRA_ARCHS:tune-armv7vetb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vetb} armv7veb-vfpv3d16 armv7vet2b-vfpv3d16"
118PACKAGE_EXTRA_ARCHS_tune-armv7veb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7veb-vfpv3d16} armv7veb-vfpv3" 118PACKAGE_EXTRA_ARCHS:tune-armv7veb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7veb-vfpv3d16} armv7veb-vfpv3"
119PACKAGE_EXTRA_ARCHS_tune-armv7vetb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vetb-vfpv3d16} armv7veb-vfpv3 armv7vet2b-vfpv3" 119PACKAGE_EXTRA_ARCHS:tune-armv7vetb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vetb-vfpv3d16} armv7veb-vfpv3 armv7vet2b-vfpv3"
120PACKAGE_EXTRA_ARCHS_tune-armv7veb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7veb} armv7veb-vfpv4d16" 120PACKAGE_EXTRA_ARCHS:tune-armv7veb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7veb} armv7veb-vfpv4d16"
121PACKAGE_EXTRA_ARCHS_tune-armv7vetb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vetb} armv7veb-vfpv4d16 armv7vet2b-vfpv4d16" 121PACKAGE_EXTRA_ARCHS:tune-armv7vetb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vetb} armv7veb-vfpv4d16 armv7vet2b-vfpv4d16"
122PACKAGE_EXTRA_ARCHS_tune-armv7veb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7veb} armv7veb-neon" 122PACKAGE_EXTRA_ARCHS:tune-armv7veb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7veb} armv7veb-neon"
123PACKAGE_EXTRA_ARCHS_tune-armv7vetb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vetb} armv7veb-neon armv7vet2b-neon" 123PACKAGE_EXTRA_ARCHS:tune-armv7vetb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vetb} armv7veb-neon armv7vet2b-neon"
124PACKAGE_EXTRA_ARCHS_tune-armv7veb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7veb-neon} armv7veb-neon-vfpv4" 124PACKAGE_EXTRA_ARCHS:tune-armv7veb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7veb-neon} armv7veb-neon-vfpv4"
125PACKAGE_EXTRA_ARCHS_tune-armv7vetb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vetb-neon} armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4" 125PACKAGE_EXTRA_ARCHS:tune-armv7vetb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vetb-neon} armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4"
126 126
127# Big Endian + HF 127# Big Endian + HF
128AVAILTUNES += "armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4" 128AVAILTUNES += "armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4"
129ARMPKGARCH_tune-armv7vehfb ?= "armv7ve" 129ARMPKGARCH:tune-armv7vehfb ?= "armv7ve"
130ARMPKGARCH_tune-armv7vethfb ?= "armv7ve" 130ARMPKGARCH:tune-armv7vethfb ?= "armv7ve"
131ARMPKGARCH_tune-armv7vehfb-vfpv3d16 ?= "armv7ve" 131ARMPKGARCH:tune-armv7vehfb-vfpv3d16 ?= "armv7ve"
132ARMPKGARCH_tune-armv7vethfb-vfpv3d16 ?= "armv7ve" 132ARMPKGARCH:tune-armv7vethfb-vfpv3d16 ?= "armv7ve"
133ARMPKGARCH_tune-armv7vehfb-vfpv3 ?= "armv7ve" 133ARMPKGARCH:tune-armv7vehfb-vfpv3 ?= "armv7ve"
134ARMPKGARCH_tune-armv7vethfb-vfpv3 ?= "armv7ve" 134ARMPKGARCH:tune-armv7vethfb-vfpv3 ?= "armv7ve"
135ARMPKGARCH_tune-armv7vehfb-vfpv4d16 ?= "armv7ve" 135ARMPKGARCH:tune-armv7vehfb-vfpv4d16 ?= "armv7ve"
136ARMPKGARCH_tune-armv7vethfb-vfpv4d16 ?= "armv7ve" 136ARMPKGARCH:tune-armv7vethfb-vfpv4d16 ?= "armv7ve"
137ARMPKGARCH_tune-armv7vehfb-neon ?= "armv7ve" 137ARMPKGARCH:tune-armv7vehfb-neon ?= "armv7ve"
138ARMPKGARCH_tune-armv7vethfb-neon ?= "armv7ve" 138ARMPKGARCH:tune-armv7vethfb-neon ?= "armv7ve"
139ARMPKGARCH_tune-armv7vehfb-neon-vfpv4 ?= "armv7ve" 139ARMPKGARCH:tune-armv7vehfb-neon-vfpv4 ?= "armv7ve"
140ARMPKGARCH_tune-armv7vethfb-neon-vfpv4 ?= "armv7ve" 140ARMPKGARCH:tune-armv7vethfb-neon-vfpv4 ?= "armv7ve"
141TUNE_FEATURES_tune-armv7vehfb = "${TUNE_FEATURES_tune-armv7vehf} bigendian" 141TUNE_FEATURES:tune-armv7vehfb = "${TUNE_FEATURES:tune-armv7vehf} bigendian"
142TUNE_FEATURES_tune-armv7vethfb = "${TUNE_FEATURES_tune-armv7vethf} bigendian" 142TUNE_FEATURES:tune-armv7vethfb = "${TUNE_FEATURES:tune-armv7vethf} bigendian"
143TUNE_FEATURES_tune-armv7vehfb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7vehf-vfpv3d16} bigendian" 143TUNE_FEATURES:tune-armv7vehfb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7vehf-vfpv3d16} bigendian"
144TUNE_FEATURES_tune-armv7vethfb-vfpv3d16 = "${TUNE_FEATURES_tune-armv7vethf-vfpv3d16} bigendian" 144TUNE_FEATURES:tune-armv7vethfb-vfpv3d16 = "${TUNE_FEATURES:tune-armv7vethf-vfpv3d16} bigendian"
145TUNE_FEATURES_tune-armv7vehfb-vfpv3 = "${TUNE_FEATURES_tune-armv7vehf-vfpv3} bigendian" 145TUNE_FEATURES:tune-armv7vehfb-vfpv3 = "${TUNE_FEATURES:tune-armv7vehf-vfpv3} bigendian"
146TUNE_FEATURES_tune-armv7vethfb-vfpv3 = "${TUNE_FEATURES_tune-armv7vethf-vfpv3} bigendian" 146TUNE_FEATURES:tune-armv7vethfb-vfpv3 = "${TUNE_FEATURES:tune-armv7vethf-vfpv3} bigendian"
147TUNE_FEATURES_tune-armv7vehfb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7vehf-vfpv4d16} bigendian" 147TUNE_FEATURES:tune-armv7vehfb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7vehf-vfpv4d16} bigendian"
148TUNE_FEATURES_tune-armv7vethfb-vfpv4d16 = "${TUNE_FEATURES_tune-armv7vethf-vfpv4d16} bigendian" 148TUNE_FEATURES:tune-armv7vethfb-vfpv4d16 = "${TUNE_FEATURES:tune-armv7vethf-vfpv4d16} bigendian"
149TUNE_FEATURES_tune-armv7vehfb-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} bigendian" 149TUNE_FEATURES:tune-armv7vehfb-neon = "${TUNE_FEATURES:tune-armv7vehf-neon} bigendian"
150TUNE_FEATURES_tune-armv7vethfb-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} bigendian" 150TUNE_FEATURES:tune-armv7vethfb-neon = "${TUNE_FEATURES:tune-armv7vethf-neon} bigendian"
151TUNE_FEATURES_tune-armv7vehfb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} bigendian" 151TUNE_FEATURES:tune-armv7vehfb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7vehf-neon-vfpv4} bigendian"
152TUNE_FEATURES_tune-armv7vethfb-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vethf-neon-vfpv4} bigendian" 152TUNE_FEATURES:tune-armv7vethfb-neon-vfpv4 = "${TUNE_FEATURES:tune-armv7vethf-neon-vfpv4} bigendian"
153PACKAGE_EXTRA_ARCHS_tune-armv7vehfb = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahfb} armv7vehfb-vfp" 153PACKAGE_EXTRA_ARCHS:tune-armv7vehfb = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahfb} armv7vehfb-vfp"
154PACKAGE_EXTRA_ARCHS_tune-armv7vethfb = "${PACKAGE_EXTRA_ARCHS_tune-armv7athfb} armv7vehfb-vfp armv7vet2hfb-vfp" 154PACKAGE_EXTRA_ARCHS:tune-armv7vethfb = "${PACKAGE_EXTRA_ARCHS:tune-armv7athfb} armv7vehfb-vfp armv7vet2hfb-vfp"
155PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehfb} armv7vehfb-vfpv3d16" 155PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehfb} armv7vehfb-vfpv3d16"
156PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethfb} armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16" 156PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethfb} armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16"
157PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-vfpv3d16} armv7vehfb-vfpv3" 157PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-vfpv3d16} armv7vehfb-vfpv3"
158PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-vfpv3d16} armv7vehfb-vfpv3 armv7vet2hfb-vfpv3" 158PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-vfpv3d16} armv7vehfb-vfpv3 armv7vet2hfb-vfpv3"
159PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehfb} armv7vehfb-vfpv4d16" 159PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehfb} armv7vehfb-vfpv4d16"
160PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethfb} armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16" 160PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-vfpv4d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethfb} armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16"
161PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehfb} armv7vehfb-neon" 161PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehfb} armv7vehfb-neon"
162PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethfb} armv7vehfb-neon armv7vet2hfb-neon" 162PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethfb} armv7vehfb-neon armv7vet2hfb-neon"
163PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehfb-neon} armv7vehfb-neon-vfpv4" 163PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehfb-neon} armv7vehfb-neon-vfpv4"
164PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethfb-neon} armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4" 164PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethfb-neon} armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4"
diff --git a/meta/conf/machine/include/arm/arch-armv8-2a.inc b/meta/conf/machine/include/arm/arch-armv8-2a.inc
index 4129689cf9..c84b1ecf24 100644
--- a/meta/conf/machine/include/arm/arch-armv8-2a.inc
+++ b/meta/conf/machine/include/arm/arch-armv8-2a.inc
@@ -9,11 +9,11 @@ require conf/machine/include/arm/arch-armv8a.inc
9 9
10# Little Endian base configs 10# Little Endian base configs
11AVAILTUNES += "armv8-2a armv8-2a-crypto" 11AVAILTUNES += "armv8-2a armv8-2a-crypto"
12ARMPKGARCH_tune-armv8-2a ?= "armv8-2a" 12ARMPKGARCH:tune-armv8-2a ?= "armv8-2a"
13ARMPKGARCH_tune-armv8-2a-crypto ?= "armv8-2a" 13ARMPKGARCH:tune-armv8-2a-crypto ?= "armv8-2a"
14TUNE_FEATURES_tune-armv8-2a = "aarch64 armv8-2a" 14TUNE_FEATURES:tune-armv8-2a = "aarch64 armv8-2a"
15TUNE_FEATURES_tune-armv8-2a-crypto = "${TUNE_FEATURES_tune-armv8-2a} crypto" 15TUNE_FEATURES:tune-armv8-2a-crypto = "${TUNE_FEATURES:tune-armv8-2a} crypto"
16PACKAGE_EXTRA_ARCHS_tune-armv8-2a = "${PACKAGE_EXTRA_ARCHS_tune-armv8a} armv8-2a" 16PACKAGE_EXTRA_ARCHS:tune-armv8-2a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8-2a"
17PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a} armv8-2a-crypto" 17PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} armv8-2a-crypto"
18BASE_LIB_tune-armv8-2a = "lib64" 18BASE_LIB:tune-armv8-2a = "lib64"
19BASE_LIB_tune-armv8-2a-crypto = "lib64" 19BASE_LIB:tune-armv8-2a-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/arch-armv8a.inc b/meta/conf/machine/include/arm/arch-armv8a.inc
index 6e92bdb7a4..819dffbeba 100644
--- a/meta/conf/machine/include/arm/arch-armv8a.inc
+++ b/meta/conf/machine/include/arm/arch-armv8a.inc
@@ -12,19 +12,19 @@ require conf/machine/include/arm/arch-arm64.inc
12 12
13# Little Endian base configs 13# Little Endian base configs
14AVAILTUNES += "armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto" 14AVAILTUNES += "armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto"
15ARMPKGARCH_tune-armv8a ?= "armv8a" 15ARMPKGARCH:tune-armv8a ?= "armv8a"
16ARMPKGARCH_tune-armv8a-crc ?= "armv8a" 16ARMPKGARCH:tune-armv8a-crc ?= "armv8a"
17ARMPKGARCH_tune-armv8a-crypto ?= "armv8a" 17ARMPKGARCH:tune-armv8a-crypto ?= "armv8a"
18ARMPKGARCH_tune-armv8a-crc-crypto ?= "armv8a" 18ARMPKGARCH:tune-armv8a-crc-crypto ?= "armv8a"
19TUNE_FEATURES_tune-armv8a = "aarch64 armv8a" 19TUNE_FEATURES:tune-armv8a = "aarch64 armv8a"
20TUNE_FEATURES_tune-armv8a-crc = "${TUNE_FEATURES_tune-armv8a} crc" 20TUNE_FEATURES:tune-armv8a-crc = "${TUNE_FEATURES:tune-armv8a} crc"
21TUNE_FEATURES_tune-armv8a-crypto = "${TUNE_FEATURES_tune-armv8a} crypto" 21TUNE_FEATURES:tune-armv8a-crypto = "${TUNE_FEATURES:tune-armv8a} crypto"
22TUNE_FEATURES_tune-armv8a-crc-crypto = "${TUNE_FEATURES_tune-armv8a-crc} crypto" 22TUNE_FEATURES:tune-armv8a-crc-crypto = "${TUNE_FEATURES:tune-armv8a-crc} crypto"
23PACKAGE_EXTRA_ARCHS_tune-armv8a = "aarch64 armv8a" 23PACKAGE_EXTRA_ARCHS:tune-armv8a = "aarch64 armv8a"
24PACKAGE_EXTRA_ARCHS_tune-armv8a-crc = "${PACKAGE_EXTRA_ARCHS_tune-armv8a} armv8a-crc" 24PACKAGE_EXTRA_ARCHS:tune-armv8a-crc = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8a-crc"
25PACKAGE_EXTRA_ARCHS_tune-armv8a-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a} armv8a-crypto" 25PACKAGE_EXTRA_ARCHS:tune-armv8a-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8a-crypto"
26PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} armv8a-crypto armv8a-crc-crypto" 26PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} armv8a-crypto armv8a-crc-crypto"
27BASE_LIB_tune-armv8a = "lib64" 27BASE_LIB:tune-armv8a = "lib64"
28BASE_LIB_tune-armv8a-crc = "lib64" 28BASE_LIB:tune-armv8a-crc = "lib64"
29BASE_LIB_tune-armv8a-crypto = "lib64" 29BASE_LIB:tune-armv8a-crypto = "lib64"
30BASE_LIB_tune-armv8a-crc-crypto = "lib64" 30BASE_LIB:tune-armv8a-crc-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65.inc
index 427e58947f..c7e86887b5 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa65" 12AVAILTUNES += "cortexa65"
13ARMPKGARCH_tune-cortexa65 = "cortexa65" 13ARMPKGARCH:tune-cortexa65 = "cortexa65"
14TUNE_FEATURES_tune-cortexa65 = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa65" 14TUNE_FEATURES:tune-cortexa65 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa65"
15PACKAGE_EXTRA_ARCHS_tune-cortexa65 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa65" 15PACKAGE_EXTRA_ARCHS:tune-cortexa65 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa65"
16BASE_LIB_tune-cortexa65 = "lib64" 16BASE_LIB:tune-cortexa65 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65ae.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65ae.inc
index aea47d0778..dad6d1b174 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65ae.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa65ae.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa65ae" 12AVAILTUNES += "cortexa65ae"
13ARMPKGARCH_tune-cortexa65ae = "cortexa65ae" 13ARMPKGARCH:tune-cortexa65ae = "cortexa65ae"
14TUNE_FEATURES_tune-cortexa65ae = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa65ae" 14TUNE_FEATURES:tune-cortexa65ae = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa65ae"
15PACKAGE_EXTRA_ARCHS_tune-cortexa65ae = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa65ae" 15PACKAGE_EXTRA_ARCHS:tune-cortexa65ae = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa65ae"
16BASE_LIB_tune-cortexa65ae = "lib64" 16BASE_LIB:tune-cortexa65ae = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75-cortexa55.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75-cortexa55.inc
index 9c45fe9c96..3a47e8278d 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75-cortexa55.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75-cortexa55.inc
@@ -10,11 +10,11 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa75-cortexa55", " -
10require conf/machine/include/arm/arch-armv8-2a.inc 10require conf/machine/include/arm/arch-armv8-2a.inc
11 11
12AVAILTUNES += "cortexa75-cortexa55 cortexa75-cortexa55-crypto" 12AVAILTUNES += "cortexa75-cortexa55 cortexa75-cortexa55-crypto"
13ARMPKGARCH_tune-cortexa75-cortexa55 = "cortexa75-cortexa55" 13ARMPKGARCH:tune-cortexa75-cortexa55 = "cortexa75-cortexa55"
14ARMPKGARCH_tune-cortexa75-cortexa55-crypto = "cortexa75-cortexa55-crypto" 14ARMPKGARCH:tune-cortexa75-cortexa55-crypto = "cortexa75-cortexa55-crypto"
15TUNE_FEATURES_tune-cortexa75-cortexa55 = "${TUNE_FEATURES_tune-armv8-2a} cortexa75-cortexa55" 15TUNE_FEATURES:tune-cortexa75-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a} cortexa75-cortexa55"
16TUNE_FEATURES_tune-cortexa75-cortexa55-crypto = "${TUNE_FEATURES_tune-cortexa75-cortexa55} crypto" 16TUNE_FEATURES:tune-cortexa75-cortexa55-crypto = "${TUNE_FEATURES:tune-cortexa75-cortexa55} crypto"
17PACKAGE_EXTRA_ARCHS_tune-cortexa75-cortexa55 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a} cortexa75-cortexa55" 17PACKAGE_EXTRA_ARCHS:tune-cortexa75-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} cortexa75-cortexa55"
18PACKAGE_EXTRA_ARCHS_tune-cortexa75-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa75-cortexa55 cortexa75-cortexa55-crypto" 18PACKAGE_EXTRA_ARCHS:tune-cortexa75-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa75-cortexa55 cortexa75-cortexa55-crypto"
19BASE_LIB_tune-cortexa75-cortexa55 = "lib64" 19BASE_LIB:tune-cortexa75-cortexa55 = "lib64"
20BASE_LIB_tune-cortexa75-cortexa55-crypto = "lib64" 20BASE_LIB:tune-cortexa75-cortexa55-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75.inc
index d019450da7..2d9a1159f1 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa75.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa75" 12AVAILTUNES += "cortexa75"
13ARMPKGARCH_tune-cortexa75 = "cortexa75" 13ARMPKGARCH:tune-cortexa75 = "cortexa75"
14TUNE_FEATURES_tune-cortexa75 = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa75" 14TUNE_FEATURES:tune-cortexa75 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa75"
15PACKAGE_EXTRA_ARCHS_tune-cortexa75 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa75" 15PACKAGE_EXTRA_ARCHS:tune-cortexa75 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa75"
16BASE_LIB_tune-cortexa75 = "lib64" 16BASE_LIB:tune-cortexa75 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
index cae8ffed74..f4c99ad6bb 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
@@ -10,11 +10,11 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa76-cortexa55", " -
10require conf/machine/include/arm/arch-armv8-2a.inc 10require conf/machine/include/arm/arch-armv8-2a.inc
11 11
12AVAILTUNES += "cortexa76-cortexa55 cortexa76-cortexa55-crypto" 12AVAILTUNES += "cortexa76-cortexa55 cortexa76-cortexa55-crypto"
13ARMPKGARCH_tune-cortexa76-cortexa55 = "cortexa76-cortexa55" 13ARMPKGARCH:tune-cortexa76-cortexa55 = "cortexa76-cortexa55"
14ARMPKGARCH_tune-cortexa76-cortexa55-crypto = "cortexa76-cortexa55-crypto" 14ARMPKGARCH:tune-cortexa76-cortexa55-crypto = "cortexa76-cortexa55-crypto"
15TUNE_FEATURES_tune-cortexa76-cortexa55 = "${TUNE_FEATURES_tune-armv8-2a} cortexa76-cortexa55" 15TUNE_FEATURES:tune-cortexa76-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a} cortexa76-cortexa55"
16TUNE_FEATURES_tune-cortexa76-cortexa55-crypto = "${TUNE_FEATURES_tune-cortexa76-cortexa55} crypto" 16TUNE_FEATURES:tune-cortexa76-cortexa55-crypto = "${TUNE_FEATURES:tune-cortexa76-cortexa55} crypto"
17PACKAGE_EXTRA_ARCHS_tune-cortexa76-cortexa55 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a} cortexa76-cortexa55" 17PACKAGE_EXTRA_ARCHS:tune-cortexa76-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} cortexa76-cortexa55"
18PACKAGE_EXTRA_ARCHS_tune-cortexa76-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa76-cortexa55 cortexa76-cortexa55-crypto" 18PACKAGE_EXTRA_ARCHS:tune-cortexa76-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76-cortexa55 cortexa76-cortexa55-crypto"
19BASE_LIB_tune-cortexa76-cortexa55 = "lib64" 19BASE_LIB:tune-cortexa76-cortexa55 = "lib64"
20BASE_LIB_tune-cortexa76-cortexa55-crypto = "lib64" 20BASE_LIB:tune-cortexa76-cortexa55-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
index ae3661a0c4..0dfdb8c5e4 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa76" 12AVAILTUNES += "cortexa76"
13ARMPKGARCH_tune-cortexa76 = "cortexa76" 13ARMPKGARCH:tune-cortexa76 = "cortexa76"
14TUNE_FEATURES_tune-cortexa76 = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa76" 14TUNE_FEATURES:tune-cortexa76 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa76"
15PACKAGE_EXTRA_ARCHS_tune-cortexa76 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa76" 15PACKAGE_EXTRA_ARCHS:tune-cortexa76 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76"
16BASE_LIB_tune-cortexa76 = "lib64" 16BASE_LIB:tune-cortexa76 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76ae.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76ae.inc
index 8d5a0ef5e2..b2863dca68 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76ae.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa76ae.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa76ae" 12AVAILTUNES += "cortexa76ae"
13ARMPKGARCH_tune-cortexa76ae = "cortexa76ae" 13ARMPKGARCH:tune-cortexa76ae = "cortexa76ae"
14TUNE_FEATURES_tune-cortexa76ae = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa76ae" 14TUNE_FEATURES:tune-cortexa76ae = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa76ae"
15PACKAGE_EXTRA_ARCHS_tune-cortexa76ae = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa76ae" 15PACKAGE_EXTRA_ARCHS:tune-cortexa76ae = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76ae"
16BASE_LIB_tune-cortexa76ae = "lib64" 16BASE_LIB:tune-cortexa76ae = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa77.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa77.inc
index 048fa319e2..654b1f6323 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-cortexa77.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa77.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa77" 12AVAILTUNES += "cortexa77"
13ARMPKGARCH_tune-cortexa77 = "cortexa77" 13ARMPKGARCH:tune-cortexa77 = "cortexa77"
14TUNE_FEATURES_tune-cortexa77 = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa77" 14TUNE_FEATURES:tune-cortexa77 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa77"
15PACKAGE_EXTRA_ARCHS_tune-cortexa77 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa77" 15PACKAGE_EXTRA_ARCHS:tune-cortexa77 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa77"
16BASE_LIB_tune-cortexa77 = "lib64" 16BASE_LIB:tune-cortexa77 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-neoversee1.inc b/meta/conf/machine/include/arm/armv8-2a/tune-neoversee1.inc
index b82c9acb6c..15ed595bde 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-neoversee1.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-neoversee1.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "neoversee1" 12AVAILTUNES += "neoversee1"
13ARMPKGARCH_tune-neoversee1 = "neoversee1" 13ARMPKGARCH:tune-neoversee1 = "neoversee1"
14TUNE_FEATURES_tune-neoversee1 = "${TUNE_FEATURES_tune-armv8-2a-crypto} neoversee1" 14TUNE_FEATURES:tune-neoversee1 = "${TUNE_FEATURES:tune-armv8-2a-crypto} neoversee1"
15PACKAGE_EXTRA_ARCHS_tune-neoversee1 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} neoversee1" 15PACKAGE_EXTRA_ARCHS:tune-neoversee1 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} neoversee1"
16BASE_LIB_tune-neoversee1 = "lib64" 16BASE_LIB:tune-neoversee1 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc b/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
index 6c6e889c0f..9d181ef4d5 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
@@ -11,7 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
11 11
12# Little Endian base configs 12# Little Endian base configs
13AVAILTUNES += "neoversen1" 13AVAILTUNES += "neoversen1"
14ARMPKGARCH_tune-neoversen1 = "neoversen1" 14ARMPKGARCH:tune-neoversen1 = "neoversen1"
15TUNE_FEATURES_tune-neoversen1 = "${TUNE_FEATURES_tune-armv8-2a-crypto} neoversen1" 15TUNE_FEATURES:tune-neoversen1 = "${TUNE_FEATURES:tune-armv8-2a-crypto} neoversen1"
16PACKAGE_EXTRA_ARCHS_tune-neoversen1 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} neoversen1" 16PACKAGE_EXTRA_ARCHS:tune-neoversen1 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} neoversen1"
17BASE_LIB_tune-neoversen1 = "lib64" 17BASE_LIB:tune-neoversen1 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8-2a/tune-octeontx2.inc b/meta/conf/machine/include/arm/armv8-2a/tune-octeontx2.inc
index f873b9517e..2cac70ea52 100644
--- a/meta/conf/machine/include/arm/armv8-2a/tune-octeontx2.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-octeontx2.inc
@@ -7,7 +7,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "octeontx2" 9AVAILTUNES += "octeontx2"
10ARMPKGARCH_tune-octeontx2 = "octeontx2" 10ARMPKGARCH:tune-octeontx2 = "octeontx2"
11TUNE_FEATURES_tune-octeontx2 = "${TUNE_FEATURES_tune-armv8-2a-crypto} octeontx2" 11TUNE_FEATURES:tune-octeontx2 = "${TUNE_FEATURES:tune-armv8-2a-crypto} octeontx2"
12PACKAGE_EXTRA_ARCHS_tune-octeontx2 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} octeontx2" 12PACKAGE_EXTRA_ARCHS:tune-octeontx2 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} octeontx2"
13BASE_LIB_tune-octeontx2 = "lib64" 13BASE_LIB:tune-octeontx2 = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8a/tune-cortexa34.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa34.inc
index f7d4c87df8..55dd845b00 100644
--- a/meta/conf/machine/include/arm/armv8a/tune-cortexa34.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa34.inc
@@ -10,11 +10,11 @@ require conf/machine/include/arm/arch-armv8a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa34 cortexa34-crypto" 12AVAILTUNES += "cortexa34 cortexa34-crypto"
13ARMPKGARCH_tune-cortexa34 = "cortexa34" 13ARMPKGARCH:tune-cortexa34 = "cortexa34"
14ARMPKGARCH_tune-cortexa34-crypto = "cortexa34" 14ARMPKGARCH:tune-cortexa34-crypto = "cortexa34"
15TUNE_FEATURES_tune-cortexa34 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa34" 15TUNE_FEATURES:tune-cortexa34 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa34"
16TUNE_FEATURES_tune-cortexa34-crypto = "${TUNE_FEATURES_tune-cortexa34} crypto" 16TUNE_FEATURES:tune-cortexa34-crypto = "${TUNE_FEATURES:tune-cortexa34} crypto"
17PACKAGE_EXTRA_ARCHS_tune-cortexa34 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa34" 17PACKAGE_EXTRA_ARCHS:tune-cortexa34 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa34"
18PACKAGE_EXTRA_ARCHS_tune-cortexa34-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa34 cortexa34-crypto" 18PACKAGE_EXTRA_ARCHS:tune-cortexa34-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa34 cortexa34-crypto"
19BASE_LIB_tune-cortexa34 = "lib64" 19BASE_LIB:tune-cortexa34 = "lib64"
20BASE_LIB_tune-cortexa34-crypto = "lib64" 20BASE_LIB:tune-cortexa34-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa35.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa35.inc
index 927296c222..869670bf0c 100644
--- a/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa35.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa35.inc
@@ -11,11 +11,11 @@ require conf/machine/include/arm/arch-armv8a.inc
11 11
12# cortexa73.cortexa35 implies crc support 12# cortexa73.cortexa35 implies crc support
13AVAILTUNES += "cortexa73-cortexa35 cortexa73-cortexa35-crypto" 13AVAILTUNES += "cortexa73-cortexa35 cortexa73-cortexa35-crypto"
14ARMPKGARCH_tune-cortexa73-cortexa35 = "cortexa73-cortexa35" 14ARMPKGARCH:tune-cortexa73-cortexa35 = "cortexa73-cortexa35"
15ARMPKGARCH_tune-cortexa73-cortexa35-crypto = "cortexa73-cortexa35-crypto" 15ARMPKGARCH:tune-cortexa73-cortexa35-crypto = "cortexa73-cortexa35-crypto"
16TUNE_FEATURES_tune-cortexa73-cortexa35 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa73-cortexa35" 16TUNE_FEATURES:tune-cortexa73-cortexa35 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa73-cortexa35"
17TUNE_FEATURES_tune-cortexa73-cortexa35-crypto = "${TUNE_FEATURES_tune-cortexa73-cortexa35} crypto" 17TUNE_FEATURES:tune-cortexa73-cortexa35-crypto = "${TUNE_FEATURES:tune-cortexa73-cortexa35} crypto"
18PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa35 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa73-cortexa35" 18PACKAGE_EXTRA_ARCHS:tune-cortexa73-cortexa35 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa73-cortexa35"
19PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa35-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa73-cortexa35 cortexa73-cortexa35-crypto" 19PACKAGE_EXTRA_ARCHS:tune-cortexa73-cortexa35-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa73-cortexa35 cortexa73-cortexa35-crypto"
20BASE_LIB_tune-cortexa73-cortexa35 = "lib64" 20BASE_LIB:tune-cortexa73-cortexa35 = "lib64"
21BASE_LIB_tune-cortexa73-cortexa35-crypto = "lib64" 21BASE_LIB:tune-cortexa73-cortexa35-crypto = "lib64"
diff --git a/meta/conf/machine/include/arm/armv8a/tune-cortexa73.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa73.inc
index ed2deb96b0..fc91dafb1d 100644
--- a/meta/conf/machine/include/arm/armv8a/tune-cortexa73.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa73.inc
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8a.inc
10 10
11# Little Endian base configs 11# Little Endian base configs
12AVAILTUNES += "cortexa73" 12AVAILTUNES += "cortexa73"
13ARMPKGARCH_tune-cortexa73 = "cortexa73" 13ARMPKGARCH:tune-cortexa73 = "cortexa73"
14TUNE_FEATURES_tune-cortexa73 = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa73" 14TUNE_FEATURES:tune-cortexa73 = "${TUNE_FEATURES:tune-armv8a-crc-crypto} cortexa73"
15PACKAGE_EXTRA_ARCHS_tune-cortexa73 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa73" 15PACKAGE_EXTRA_ARCHS:tune-cortexa73 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa73"
16BASE_LIB_tune-cortexa73 = "lib64" 16BASE_LIB:tune-cortexa73 = "lib64"
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bae169da3a..1c9a118160 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -22,9 +22,9 @@ python () {
22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" 22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}"
23 23
24ARM_THUMB_SUFFIX = "t2" 24ARM_THUMB_SUFFIX = "t2"
25ARM_THUMB_SUFFIX_armv4 = "t" 25ARM_THUMB_SUFFIX:armv4 = "t"
26ARM_THUMB_SUFFIX_armv5 = "t" 26ARM_THUMB_SUFFIX:armv5 = "t"
27ARM_THUMB_SUFFIX_armv6 = "t" 27ARM_THUMB_SUFFIX:armv6 = "t"
28 28
29# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb 29# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
30ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" 30ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}"
diff --git a/meta/conf/machine/include/m68k/arch-m68k.inc b/meta/conf/machine/include/m68k/arch-m68k.inc
index 3ff8a3a5b5..3f0f2ff57e 100644
--- a/meta/conf/machine/include/m68k/arch-m68k.inc
+++ b/meta/conf/machine/include/m68k/arch-m68k.inc
@@ -5,4 +5,4 @@ DEFAULTTUNE ?= "m68k"
5# Architecture name 5# Architecture name
6TUNE_ARCH = "m68k" 6TUNE_ARCH = "m68k"
7 7
8TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 8TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
diff --git a/meta/conf/machine/include/mips/README b/meta/conf/machine/include/mips/README
index f36e87b45a..77448c5190 100644
--- a/meta/conf/machine/include/mips/README
+++ b/meta/conf/machine/include/mips/README
@@ -23,7 +23,7 @@ scheme. The scheme is: <mips variant>[-nf][-n32]
23 23
24TUNE_PKGARCH is defined as: 24TUNE_PKGARCH is defined as:
25 25
26${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI} 26${MIPSPKGSFX_VARIANT:tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}
27 27
28The following is a list of MIPS specific variables: 28The following is a list of MIPS specific variables:
29 29
@@ -35,7 +35,7 @@ defined as "el".
35MIPSPKGSFX_ENDIAN2 - For bigendian hardware this is "eb", otherwise it's 35MIPSPKGSFX_ENDIAN2 - For bigendian hardware this is "eb", otherwise it's
36defined as "el". 36defined as "el".
37 37
38MIPSPKGSFX_VARIANT_tune-<tune> - In the default tunings it is set to the 38MIPSPKGSFX_VARIANT:tune-<tune> - In the default tunings it is set to the
39same value as TUNE_ARCH. In custom, optimized tunings, the value should 39same value as TUNE_ARCH. In custom, optimized tunings, the value should
40be modified to more precisely describe the tuning. 40be modified to more precisely describe the tuning.
41 41
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index cb1a4c443c..e48ddd2d6b 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -21,7 +21,7 @@ ABIEXTENSION .= "${@bb.utils.filter('TUNE_FEATURES', 'n32', d)}"
21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}" 21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}"
22 22
23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture" 23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture"
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}"
25 25
26TUNEVALID[n64] = "MIPS64 n64 ABI" 26TUNEVALID[n64] = "MIPS64 n64 ABI"
27TUNECONFLICTS[n64] = "o32 n32" 27TUNECONFLICTS[n64] = "o32 n32"
@@ -49,7 +49,7 @@ MIPSPKGSFX_64R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', 'isa', '
49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}" 49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}"
50 50
51TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}" 51TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}"
52TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}" 52TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT:tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
53 53
54# Various Global Machine Overrides 54# Various Global Machine Overrides
55MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64${MIPSPKGSFX_ENDIAN2}:', '', d)}" 55MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64${MIPSPKGSFX_ENDIAN2}:', '', d)}"
@@ -64,88 +64,88 @@ MACHINEOVERRIDES =. "mipsarch:"
64 64
65# Base tunes 65# Base tunes
66AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf" 66AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf"
67TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard" 67TUNE_FEATURES:tune-mips = "o32 bigendian fpu-hard"
68BASE_LIB_tune-mips = "lib" 68BASE_LIB:tune-mips = "lib"
69MIPSPKGSFX_VARIANT_tune-mips = "${TUNE_ARCH}" 69MIPSPKGSFX_VARIANT:tune-mips = "${TUNE_ARCH}"
70PACKAGE_EXTRA_ARCHS_tune-mips = "mips" 70PACKAGE_EXTRA_ARCHS:tune-mips = "mips"
71 71
72TUNE_FEATURES_tune-mips64-n32 = "n32 bigendian fpu-hard" 72TUNE_FEATURES:tune-mips64-n32 = "n32 bigendian fpu-hard"
73BASE_LIB_tune-mips64-n32 = "lib32" 73BASE_LIB:tune-mips64-n32 = "lib32"
74MIPSPKGSFX_VARIANT_tune-mips64-n32 = "${TUNE_ARCH}" 74MIPSPKGSFX_VARIANT:tune-mips64-n32 = "${TUNE_ARCH}"
75PACKAGE_EXTRA_ARCHS_tune-mips64-n32 = "mips64-n32" 75PACKAGE_EXTRA_ARCHS:tune-mips64-n32 = "mips64-n32"
76 76
77TUNE_FEATURES_tune-mips64 = "n64 bigendian fpu-hard" 77TUNE_FEATURES:tune-mips64 = "n64 bigendian fpu-hard"
78BASE_LIB_tune-mips64 = "lib64" 78BASE_LIB:tune-mips64 = "lib64"
79MIPSPKGSFX_VARIANT_tune-mips64 = "${TUNE_ARCH}" 79MIPSPKGSFX_VARIANT:tune-mips64 = "${TUNE_ARCH}"
80PACKAGE_EXTRA_ARCHS_tune-mips64 = "mips64" 80PACKAGE_EXTRA_ARCHS:tune-mips64 = "mips64"
81 81
82TUNE_FEATURES_tune-mipsel = "o32 fpu-hard" 82TUNE_FEATURES:tune-mipsel = "o32 fpu-hard"
83BASE_LIB_tune-mipsel = "lib" 83BASE_LIB:tune-mipsel = "lib"
84MIPSPKGSFX_VARIANT_tune-mipsel = "${TUNE_ARCH}" 84MIPSPKGSFX_VARIANT:tune-mipsel = "${TUNE_ARCH}"
85PACKAGE_EXTRA_ARCHS_tune-mipsel = "mipsel" 85PACKAGE_EXTRA_ARCHS:tune-mipsel = "mipsel"
86 86
87TUNE_FEATURES_tune-mips64el-n32 = "n32 fpu-hard" 87TUNE_FEATURES:tune-mips64el-n32 = "n32 fpu-hard"
88BASE_LIB_tune-mips64el-n32 = "lib32" 88BASE_LIB:tune-mips64el-n32 = "lib32"
89MIPSPKGSFX_VARIANT_tune-mips64el-n32 = "${TUNE_ARCH}" 89MIPSPKGSFX_VARIANT:tune-mips64el-n32 = "${TUNE_ARCH}"
90PACKAGE_EXTRA_ARCHS_tune-mips64el-n32 = "mips64el-n32" 90PACKAGE_EXTRA_ARCHS:tune-mips64el-n32 = "mips64el-n32"
91 91
92TUNE_FEATURES_tune-mips64el = "n64 fpu-hard" 92TUNE_FEATURES:tune-mips64el = "n64 fpu-hard"
93BASE_LIB_tune-mips64el = "lib64" 93BASE_LIB:tune-mips64el = "lib64"
94MIPSPKGSFX_VARIANT_tune-mips64el = "${TUNE_ARCH}" 94MIPSPKGSFX_VARIANT:tune-mips64el = "${TUNE_ARCH}"
95PACKAGE_EXTRA_ARCHS_tune-mips64el = "mips64el" 95PACKAGE_EXTRA_ARCHS:tune-mips64el = "mips64el"
96 96
97TUNE_FEATURES_tune-mips-nf = "o32 bigendian" 97TUNE_FEATURES:tune-mips-nf = "o32 bigendian"
98BASE_LIB_tune-mips-nf = "lib" 98BASE_LIB:tune-mips-nf = "lib"
99MIPSPKGSFX_VARIANT_tune-mips-nf = "${TUNE_ARCH}" 99MIPSPKGSFX_VARIANT:tune-mips-nf = "${TUNE_ARCH}"
100PACKAGE_EXTRA_ARCHS_tune-mips-nf = "mips-nf" 100PACKAGE_EXTRA_ARCHS:tune-mips-nf = "mips-nf"
101 101
102TUNE_FEATURES_tune-mips64-nf-n32 = "n32 bigendian" 102TUNE_FEATURES:tune-mips64-nf-n32 = "n32 bigendian"
103BASE_LIB_tune-mips64-nf-n32 = "lib32" 103BASE_LIB:tune-mips64-nf-n32 = "lib32"
104MIPSPKGSFX_VARIANT_tune-mips64-nf-n32 = "${TUNE_ARCH}" 104MIPSPKGSFX_VARIANT:tune-mips64-nf-n32 = "${TUNE_ARCH}"
105PACKAGE_EXTRA_ARCHS_tune-mips64-nf-n32 = "mips64-nf-n32" 105PACKAGE_EXTRA_ARCHS:tune-mips64-nf-n32 = "mips64-nf-n32"
106 106
107TUNE_FEATURES_tune-mips64-nf = "n64 bigendian" 107TUNE_FEATURES:tune-mips64-nf = "n64 bigendian"
108BASE_LIB_tune-mips64-nf = "lib64" 108BASE_LIB:tune-mips64-nf = "lib64"
109MIPSPKGSFX_VARIANT_tune-mips64-nf = "${TUNE_ARCH}" 109MIPSPKGSFX_VARIANT:tune-mips64-nf = "${TUNE_ARCH}"
110PACKAGE_EXTRA_ARCHS_tune-mips64-nf = "mips64-nf" 110PACKAGE_EXTRA_ARCHS:tune-mips64-nf = "mips64-nf"
111 111
112TUNE_FEATURES_tune-mipsel-nf = "o32" 112TUNE_FEATURES:tune-mipsel-nf = "o32"
113BASE_LIB_tune-mipsel-nf = "lib" 113BASE_LIB:tune-mipsel-nf = "lib"
114MIPSPKGSFX_VARIANT_tune-mipsel-nf = "${TUNE_ARCH}" 114MIPSPKGSFX_VARIANT:tune-mipsel-nf = "${TUNE_ARCH}"
115PACKAGE_EXTRA_ARCHS_tune-mipsel-nf = "mipsel-nf" 115PACKAGE_EXTRA_ARCHS:tune-mipsel-nf = "mipsel-nf"
116 116
117TUNE_FEATURES_tune-mips64el-nf-n32 = "n32" 117TUNE_FEATURES:tune-mips64el-nf-n32 = "n32"
118BASE_LIB_tune-mips64el-nf-n32 = "lib32" 118BASE_LIB:tune-mips64el-nf-n32 = "lib32"
119MIPSPKGSFX_VARIANT_tune-mips64el-nf-n32 = "${TUNE_ARCH}" 119MIPSPKGSFX_VARIANT:tune-mips64el-nf-n32 = "${TUNE_ARCH}"
120PACKAGE_EXTRA_ARCHS_tune-mips64el-nf-n32 = "mips64el-nf-n32" 120PACKAGE_EXTRA_ARCHS:tune-mips64el-nf-n32 = "mips64el-nf-n32"
121 121
122TUNE_FEATURES_tune-mips64el-nf = "n64" 122TUNE_FEATURES:tune-mips64el-nf = "n64"
123BASE_LIB_tune-mips64el-nf = "lib64" 123BASE_LIB:tune-mips64el-nf = "lib64"
124MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" 124MIPSPKGSFX_VARIANT:tune-mips64el-nf = "${TUNE_ARCH}"
125PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" 125PACKAGE_EXTRA_ARCHS:tune-mips64el-nf = "mips64el-nf"
126 126
127# MIPS 64 + o32 127# MIPS 64 + o32
128AVAILTUNES += "mips64-o32 mips64el-o32" 128AVAILTUNES += "mips64-o32 mips64el-o32"
129 129
130TUNE_FEATURES_tune-mips64-o32 = "o32 bigendian fpu-hard" 130TUNE_FEATURES:tune-mips64-o32 = "o32 bigendian fpu-hard"
131BASE_LIB_tune-mips64-o32 = "lib" 131BASE_LIB:tune-mips64-o32 = "lib"
132MIPSPKGSFX_VARIANT_tune-mips64-o32 = "${TUNE_ARCH}" 132MIPSPKGSFX_VARIANT:tune-mips64-o32 = "${TUNE_ARCH}"
133PACKAGE_EXTRA_ARCHS_tune-mips64-o32 = "mips mips64-o32" 133PACKAGE_EXTRA_ARCHS:tune-mips64-o32 = "mips mips64-o32"
134 134
135TUNE_FEATURES_tune-mips64el-o32 = "o32 fpu-hard" 135TUNE_FEATURES:tune-mips64el-o32 = "o32 fpu-hard"
136BASE_LIB_tune-mips64el-o32 = "lib" 136BASE_LIB:tune-mips64el-o32 = "lib"
137MIPSPKGSFX_VARIANT_tune-mips64el-o32 = "${TUNE_ARCH}" 137MIPSPKGSFX_VARIANT:tune-mips64el-o32 = "${TUNE_ARCH}"
138PACKAGE_EXTRA_ARCHS_tune-mips64el-o32 = "mipsel mips64el-o32" 138PACKAGE_EXTRA_ARCHS:tune-mips64el-o32 = "mipsel mips64el-o32"
139 139
140# MIPS 64 o32 and Soft Float 140# MIPS 64 o32 and Soft Float
141AVAILTUNES += "mips64-nf-o32 mips64el-nf-o32" 141AVAILTUNES += "mips64-nf-o32 mips64el-nf-o32"
142 142
143TUNE_FEATURES_tune-mips64-nf-o32 = "o32 bigendian" 143TUNE_FEATURES:tune-mips64-nf-o32 = "o32 bigendian"
144BASE_LIB_tune-mips64-nf-o32 = "lib" 144BASE_LIB:tune-mips64-nf-o32 = "lib"
145MIPSPKGSFX_VARIANT_tune-mips64-nf-o32 = "${TUNE_ARCH}" 145MIPSPKGSFX_VARIANT:tune-mips64-nf-o32 = "${TUNE_ARCH}"
146PACKAGE_EXTRA_ARCHS_tune-mips64-nf-o32 = "mips-nf mips64-nf-o32" 146PACKAGE_EXTRA_ARCHS:tune-mips64-nf-o32 = "mips-nf mips64-nf-o32"
147 147
148TUNE_FEATURES_tune-mips64el-nf-o32 = "o32" 148TUNE_FEATURES:tune-mips64el-nf-o32 = "o32"
149BASE_LIB_tune-mips64el-nf-o32 = "lib" 149BASE_LIB:tune-mips64el-nf-o32 = "lib"
150MIPSPKGSFX_VARIANT_tune-mips64el-nf-o32 = "${TUNE_ARCH}" 150MIPSPKGSFX_VARIANT:tune-mips64el-nf-o32 = "${TUNE_ARCH}"
151PACKAGE_EXTRA_ARCHS_tune-mips64el-nf-o32 = "mipsel-nf mips64el-nf-o32" 151PACKAGE_EXTRA_ARCHS:tune-mips64el-nf-o32 = "mipsel-nf mips64el-nf-o32"
diff --git a/meta/conf/machine/include/mips/tune-mips-24k.inc b/meta/conf/machine/include/mips/tune-mips-24k.inc
index 828acd42e3..ed6566587d 100644
--- a/meta/conf/machine/include/mips/tune-mips-24k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-24k.inc
@@ -16,36 +16,36 @@ AVAILTUNES += "mips32r2-24kc mips32r2-24kec mips32r2-24kec-m16"
16AVAILTUNES += "mips32r2el-24kc mips32r2el-24kec mips32r2el-24kec-m16" 16AVAILTUNES += "mips32r2el-24kc mips32r2el-24kec mips32r2el-24kec-m16"
17 17
18# big endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16 18# big endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16
19TUNE_FEATURES_tune-mips32r2-24kc = "${TUNE_FEATURES_tune-mips32r2-nf} 24kc" 19TUNE_FEATURES:tune-mips32r2-24kc = "${TUNE_FEATURES:tune-mips32r2-nf} 24kc"
20TUNE_FEATURES_tune-mips32r2-24kec = "${TUNE_FEATURES_tune-mips32r2-nf} 24kec" 20TUNE_FEATURES:tune-mips32r2-24kec = "${TUNE_FEATURES:tune-mips32r2-nf} 24kec"
21TUNE_FEATURES_tune-mips32r2-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2-24kec} mips16e" 21TUNE_FEATURES:tune-mips32r2-24kec-m16 = "${TUNE_FEATURES:tune-mips32r2-24kec} mips16e"
22 22
23MIPSPKGSFX_VARIANT_tune-mips32r2-24kc = "mips32r2-24kc" 23MIPSPKGSFX_VARIANT:tune-mips32r2-24kc = "mips32r2-24kc"
24PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-24kc-nf" 24PACKAGE_EXTRA_ARCHS:tune-mips32r2-24kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-nf} mips32r2-24kc-nf"
25QEMU_EXTRAOPTIONS_mips32r2-24kc-nf = " -cpu 24Kc" 25QEMU_EXTRAOPTIONS_mips32r2-24kc-nf = " -cpu 24Kc"
26 26
27MIPSPKGSFX_VARIANT_tune-mips32r2-24kec = "mips32r2-24kec" 27MIPSPKGSFX_VARIANT:tune-mips32r2-24kec = "mips32r2-24kec"
28PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc} mips32r2-24kec-nf" 28PACKAGE_EXTRA_ARCHS:tune-mips32r2-24kec = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-24kc} mips32r2-24kec-nf"
29QEMU_EXTRAOPTIONS_mips32r2-24kec-nf = " -cpu 24KEc" 29QEMU_EXTRAOPTIONS_mips32r2-24kec-nf = " -cpu 24KEc"
30 30
31MIPSPKGSFX_VARIANT_tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}" 31MIPSPKGSFX_VARIANT:tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}"
32PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec} mips32r2-24kec-m16-nf" 32PACKAGE_EXTRA_ARCHS:tune-mips32r2-24kec-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-24kec} mips32r2-24kec-m16-nf"
33QEMU_EXTRAOPTIONS_mips32r2-24kec-m16-nf = " -cpu 24KEc" 33QEMU_EXTRAOPTIONS_mips32r2-24kec-m16-nf = " -cpu 24KEc"
34 34
35 35
36# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16 36# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16
37TUNE_FEATURES_tune-mips32r2el-24kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 24kc" 37TUNE_FEATURES:tune-mips32r2el-24kc = "${TUNE_FEATURES:tune-mips32r2el-nf} 24kc"
38TUNE_FEATURES_tune-mips32r2el-24kec = "${TUNE_FEATURES_tune-mips32r2el-nf} 24kec" 38TUNE_FEATURES:tune-mips32r2el-24kec = "${TUNE_FEATURES:tune-mips32r2el-nf} 24kec"
39TUNE_FEATURES_tune-mips32r2el-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2el-24kec} mips16e" 39TUNE_FEATURES:tune-mips32r2el-24kec-m16 = "${TUNE_FEATURES:tune-mips32r2el-24kec} mips16e"
40 40
41MIPSPKGSFX_VARIANT_tune-mips32r2el-24kc = "mips32r2el-24kc" 41MIPSPKGSFX_VARIANT:tune-mips32r2el-24kc = "mips32r2el-24kc"
42PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-24kc-nf" 42PACKAGE_EXTRA_ARCHS:tune-mips32r2el-24kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-nf} mips32r2el-24kc-nf"
43QEMU_EXTRAOPTIONS_mips32r2el-24kc-nf = " -cpu 24Kc" 43QEMU_EXTRAOPTIONS_mips32r2el-24kc-nf = " -cpu 24Kc"
44 44
45MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec = "mips32r2el-24kec" 45MIPSPKGSFX_VARIANT:tune-mips32r2el-24kec = "mips32r2el-24kec"
46PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc} mips32r2el-24kec-nf" 46PACKAGE_EXTRA_ARCHS:tune-mips32r2el-24kec = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-24kc} mips32r2el-24kec-nf"
47QEMU_EXTRAOPTIONS_mips32r2el-24kec-nf = " -cpu 24KEc" 47QEMU_EXTRAOPTIONS_mips32r2el-24kec-nf = " -cpu 24KEc"
48 48
49MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}" 49MIPSPKGSFX_VARIANT:tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}"
50PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec} mips32r2el-24kec-m16-nf" 50PACKAGE_EXTRA_ARCHS:tune-mips32r2el-24kec-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-24kec} mips32r2el-24kec-m16-nf"
51QEMU_EXTRAOPTIONS_mips32r2el-24kec-m16-nf = " -cpu 24KEc" 51QEMU_EXTRAOPTIONS_mips32r2el-24kec-m16-nf = " -cpu 24KEc"
diff --git a/meta/conf/machine/include/mips/tune-mips-74k.inc b/meta/conf/machine/include/mips/tune-mips-74k.inc
index 94afee34bd..988cfaef6e 100644
--- a/meta/conf/machine/include/mips/tune-mips-74k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-74k.inc
@@ -13,25 +13,25 @@ AVAILTUNES += "mips32r2-74kc mips32r2-74kc-m16"
13AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16" 13AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16"
14 14
15# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 15# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16
16TUNE_FEATURES_tune-mips32r2-74kc = "${TUNE_FEATURES_tune-mips32r2-nf} 74kc" 16TUNE_FEATURES:tune-mips32r2-74kc = "${TUNE_FEATURES:tune-mips32r2-nf} 74kc"
17TUNE_FEATURES_tune-mips32r2-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2-74kc} mips16e" 17TUNE_FEATURES:tune-mips32r2-74kc-m16 = "${TUNE_FEATURES:tune-mips32r2-74kc} mips16e"
18 18
19MIPSPKGSFX_VARIANT_tune-mips32r2-74kc = "mips32r2-74kc" 19MIPSPKGSFX_VARIANT:tune-mips32r2-74kc = "mips32r2-74kc"
20PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-74kc-nf" 20PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-nf} mips32r2-74kc-nf"
21QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc" 21QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc"
22 22
23MIPSPKGSFX_VARIANT_tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}" 23MIPSPKGSFX_VARIANT:tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}"
24PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc} mips32r2-74kc-m16-nf" 24PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc} mips32r2-74kc-m16-nf"
25QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc" 25QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc"
26 26
27# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 27# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16
28TUNE_FEATURES_tune-mips32r2el-74kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 74kc" 28TUNE_FEATURES:tune-mips32r2el-74kc = "${TUNE_FEATURES:tune-mips32r2el-nf} 74kc"
29TUNE_FEATURES_tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2el-74kc} mips16e" 29TUNE_FEATURES:tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES:tune-mips32r2el-74kc} mips16e"
30 30
31MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc = "mips32r2el-74kc" 31MIPSPKGSFX_VARIANT:tune-mips32r2el-74kc = "mips32r2el-74kc"
32PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-74kc-nf" 32PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-nf} mips32r2el-74kc-nf"
33QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc" 33QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc"
34 34
35MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}" 35MIPSPKGSFX_VARIANT:tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}"
36PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf" 36PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf"
37QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc" 37QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc"
diff --git a/meta/conf/machine/include/powerpc/README b/meta/conf/machine/include/powerpc/README
index e87fb5082c..e813d21818 100644
--- a/meta/conf/machine/include/powerpc/README
+++ b/meta/conf/machine/include/powerpc/README
@@ -12,6 +12,6 @@ May of the PowerPC package archictures are based on legacy Linux names.
12However, a general naming scheme should be similar to: ppc[64][<family>][-nf]. 12However, a general naming scheme should be similar to: ppc[64][<family>][-nf].
13(Note: the default package architectures are "powerpc" and "powerpc64".) 13(Note: the default package architectures are "powerpc" and "powerpc64".)
14 14
15TUNE_PKGARCH is defined as TUNE_PKGARCH_tune-${DEFAULTTUNE}. All 15TUNE_PKGARCH is defined as TUNE_PKGARCH:tune-${DEFAULTTUNE}. All
16PowerPC tunings are required to define TUNE_PKGARCH_tune-<tune>. 16PowerPC tunings are required to define TUNE_PKGARCH:tune-<tune>.
17 17
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index ef18e9ac8b..be687e2df7 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -5,7 +5,7 @@
5 5
6DEFAULTTUNE ?= "powerpc" 6DEFAULTTUNE ?= "powerpc"
7 7
8TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 8TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
9ABIEXTENSION ?= "" 9ABIEXTENSION ?= ""
10 10
11# Endian 11# Endian
@@ -30,22 +30,22 @@ TUNEVALID[altivec] = "Altivec"
30# Basic tune definitions 30# Basic tune definitions
31AVAILTUNES += "powerpc powerpc-nf powerpcle powerpcle-nf" 31AVAILTUNES += "powerpc powerpc-nf powerpcle powerpcle-nf"
32 32
33TUNE_FEATURES_tune-powerpc-nf = "m32 fpu-soft bigendian" 33TUNE_FEATURES:tune-powerpc-nf = "m32 fpu-soft bigendian"
34BASE_LIB_tune-powerpc-nf = "lib" 34BASE_LIB:tune-powerpc-nf = "lib"
35TUNE_PKGARCH_tune-powerpc-nf = "powerpc-nf" 35TUNE_PKGARCH:tune-powerpc-nf = "powerpc-nf"
36PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" 36PACKAGE_EXTRA_ARCHS:tune-powerpc-nf = "powerpc-nf"
37 37
38TUNE_FEATURES_tune-powerpc = "m32 fpu-hard bigendian" 38TUNE_FEATURES:tune-powerpc = "m32 fpu-hard bigendian"
39BASE_LIB_tune-powerpc = "lib" 39BASE_LIB:tune-powerpc = "lib"
40TUNE_PKGARCH_tune-powerpc = "powerpc" 40TUNE_PKGARCH:tune-powerpc = "powerpc"
41PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc" 41PACKAGE_EXTRA_ARCHS:tune-powerpc = "powerpc"
42 42
43TUNE_FEATURES_tune-powerpcle-nf = "m32 fpu-soft" 43TUNE_FEATURES:tune-powerpcle-nf = "m32 fpu-soft"
44BASE_LIB_tune-powerpcle-nf = "lib" 44BASE_LIB:tune-powerpcle-nf = "lib"
45TUNE_PKGARCH_tune-powerpcle-nf = "powerpcle-nf" 45TUNE_PKGARCH:tune-powerpcle-nf = "powerpcle-nf"
46PACKAGE_EXTRA_ARCHS_tune-powerpcle-nf = "powerpcle-nf" 46PACKAGE_EXTRA_ARCHS:tune-powerpcle-nf = "powerpcle-nf"
47 47
48TUNE_FEATURES_tune-powerpcle = "m32 fpu-hard" 48TUNE_FEATURES:tune-powerpcle = "m32 fpu-hard"
49BASE_LIB_tune-powerpcle = "lib" 49BASE_LIB:tune-powerpcle = "lib"
50TUNE_PKGARCH_tune-powerpcle = "powerpcle" 50TUNE_PKGARCH:tune-powerpcle = "powerpcle"
51PACKAGE_EXTRA_ARCHS_tune-powerpcle = "powerpcle" 51PACKAGE_EXTRA_ARCHS:tune-powerpcle = "powerpcle"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 467abc5faa..2533151869 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -12,12 +12,12 @@ TUNE_CCARGS .= "${@['', ' -mabi=elfv2']['libc-musl' in d.getVar('OVERRIDES').spl
12 12
13AVAILTUNES += "powerpc64 powerpc64le" 13AVAILTUNES += "powerpc64 powerpc64le"
14 14
15TUNE_FEATURES_tune-powerpc64 = "m64 fpu-hard bigendian" 15TUNE_FEATURES:tune-powerpc64 = "m64 fpu-hard bigendian"
16BASE_LIB_tune-powerpc64 = "lib64" 16BASE_LIB:tune-powerpc64 = "lib64"
17TUNE_PKGARCH_tune-powerpc64 = "powerpc64" 17TUNE_PKGARCH:tune-powerpc64 = "powerpc64"
18PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64" 18PACKAGE_EXTRA_ARCHS:tune-powerpc64 = "powerpc64"
19 19
20TUNE_FEATURES_tune-powerpc64le = "m64 fpu-hard" 20TUNE_FEATURES:tune-powerpc64le = "m64 fpu-hard"
21BASE_LIB_tune-powerpc64le = "lib64" 21BASE_LIB:tune-powerpc64le = "lib64"
22TUNE_PKGARCH_tune-powerpc64le = "powerpc64le" 22TUNE_PKGARCH:tune-powerpc64le = "powerpc64le"
23PACKAGE_EXTRA_ARCHS_tune-powerpc64le = "powerpc64le" 23PACKAGE_EXTRA_ARCHS:tune-powerpc64le = "powerpc64le"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 7d0a6fe458..c7136da711 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -16,7 +16,7 @@ MACHINEOVERRIDES =. "qemuall:"
16IMAGE_FSTYPES += "tar.bz2 ext4" 16IMAGE_FSTYPES += "tar.bz2 ext4"
17 17
18# Don't include kernels in standard images 18# Don't include kernels in standard images
19RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 19RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
20 20
21# Use a common kernel recipe for all QEMU machines 21# Use a common kernel recipe for all QEMU machines
22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
@@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
24EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" 24EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native"
25 25
26# Provide the nfs server kernel module for all qemu images 26# Provide the nfs server kernel module for all qemu images
27KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" 27KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
28KERNEL_FEATURES_append_pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" 28KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
29 29
30IMAGE_CLASSES += "qemuboot" 30IMAGE_CLASSES += "qemuboot"
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index a2dcdc6d5a..d3b91070a8 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -1,11 +1,11 @@
1# For runqemu 1# For runqemu
2IMAGE_CLASSES += "qemuboot" 2IMAGE_CLASSES += "qemuboot"
3QB_SMP = "-smp 4" 3QB_SMP = "-smp 4"
4QB_CPU_x86 = "-cpu IvyBridge -machine q35" 4QB_CPU:x86 = "-cpu IvyBridge -machine q35"
5QB_CPU_KVM_x86 = "-cpu IvyBridge -machine q35" 5QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35"
6 6
7QB_CPU_x86-64 = "-cpu IvyBridge -machine q35" 7QB_CPU:x86-64 = "-cpu IvyBridge -machine q35"
8QB_CPU_KVM_x86-64 = "-cpu IvyBridge -machine q35" 8QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
9 9
10QB_AUDIO_DRV = "alsa" 10QB_AUDIO_DRV = "alsa"
11QB_AUDIO_OPT = "-soundhw ac97,es1370" 11QB_AUDIO_OPT = "-soundhw ac97,es1370"
diff --git a/meta/conf/machine/include/riscv/arch-riscv.inc b/meta/conf/machine/include/riscv/arch-riscv.inc
index eae2b88778..e5611a12a6 100644
--- a/meta/conf/machine/include/riscv/arch-riscv.inc
+++ b/meta/conf/machine/include/riscv/arch-riscv.inc
@@ -2,12 +2,12 @@
2 2
3DEFAULTTUNE ?= "riscv64" 3DEFAULTTUNE ?= "riscv64"
4 4
5TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}" 5TUNE_ARCH = "${TUNE_ARCH:tune-${DEFAULTTUNE}}"
6TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 6TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
7TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', ' -mabi=lp64', ' ', d)}" 7TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv64nf', ' -mabi=lp64', ' ', d)}"
8TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', ' -mabi=ilp32', ' ', d)}" 8TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32nf', ' -mabi=ilp32', ' ', d)}"
9 9
10# Fix: ld: unrecognized option '--hash-style=sysv' 10# Fix: ld: unrecognized option '--hash-style=sysv'
11LINKER_HASH_STYLE_libc-newlib = "" 11LINKER_HASH_STYLE:libc-newlib = ""
12# Fix: ld: unrecognized option '--hash-style=gnu' 12# Fix: ld: unrecognized option '--hash-style=gnu'
13LINKER_HASH_STYLE_libc-baremetal = "" 13LINKER_HASH_STYLE:libc-baremetal = ""
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc
index 20e2d465a1..14eaf5d64a 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -22,8 +22,8 @@ EXTRA_IMAGEDEPENDS += "opensbi"
22RISCV_SBI_PLAT ?= "generic" 22RISCV_SBI_PLAT ?= "generic"
23RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin" 23RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
24 24
25UBOOT_ENTRYPOINT_riscv32 = "0x80400000" 25UBOOT_ENTRYPOINT:riscv32 = "0x80400000"
26UBOOT_ENTRYPOINT_riscv64 = "0x80200000" 26UBOOT_ENTRYPOINT:riscv64 = "0x80200000"
27 27
28# qemuboot options 28# qemuboot options
29QB_SMP = "-smp 4" 29QB_SMP = "-smp 4"
diff --git a/meta/conf/machine/include/riscv/tune-riscv.inc b/meta/conf/machine/include/riscv/tune-riscv.inc
index 028548bf56..cc2896f277 100644
--- a/meta/conf/machine/include/riscv/tune-riscv.inc
+++ b/meta/conf/machine/include/riscv/tune-riscv.inc
@@ -11,23 +11,23 @@ TUNEVALID[bigendian] = "Big endian mode"
11AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf" 11AVAILTUNES += "riscv64 riscv32 riscv64nf riscv32nf"
12 12
13# Default 13# Default
14TUNE_FEATURES_tune-riscv64 = "riscv64" 14TUNE_FEATURES:tune-riscv64 = "riscv64"
15TUNE_ARCH_tune-riscv64 = "riscv64" 15TUNE_ARCH:tune-riscv64 = "riscv64"
16TUNE_PKGARCH_tune-riscv64 = "riscv64" 16TUNE_PKGARCH:tune-riscv64 = "riscv64"
17PACKAGE_EXTRA_ARCHS_tune-riscv64 = "riscv64" 17PACKAGE_EXTRA_ARCHS:tune-riscv64 = "riscv64"
18 18
19TUNE_FEATURES_tune-riscv32 = "riscv32" 19TUNE_FEATURES:tune-riscv32 = "riscv32"
20TUNE_ARCH_tune-riscv32 = "riscv32" 20TUNE_ARCH:tune-riscv32 = "riscv32"
21TUNE_PKGARCH_tune-riscv32 = "riscv32" 21TUNE_PKGARCH:tune-riscv32 = "riscv32"
22PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32" 22PACKAGE_EXTRA_ARCHS:tune-riscv32 = "riscv32"
23 23
24# No float 24# No float
25TUNE_FEATURES_tune-riscv64nf = "${TUNE_FEATURES_tune-riscv64} riscv64nf" 25TUNE_FEATURES:tune-riscv64nf = "${TUNE_FEATURES:tune-riscv64} riscv64nf"
26TUNE_ARCH_tune-riscv64nf = "riscv64" 26TUNE_ARCH:tune-riscv64nf = "riscv64"
27TUNE_PKGARCH_tune-riscv64nf = "riscv64nf" 27TUNE_PKGARCH:tune-riscv64nf = "riscv64nf"
28PACKAGE_EXTRA_ARCHS_tune-riscv64nf = "riscv64nf" 28PACKAGE_EXTRA_ARCHS:tune-riscv64nf = "riscv64nf"
29 29
30TUNE_FEATURES_tune-riscv32nf = "${TUNE_FEATURES_tune-riscv32} riscv32nf" 30TUNE_FEATURES:tune-riscv32nf = "${TUNE_FEATURES:tune-riscv32} riscv32nf"
31TUNE_ARCH_tune-riscv32nf = "riscv32" 31TUNE_ARCH:tune-riscv32nf = "riscv32"
32TUNE_PKGARCH_tune-riscv32nf = "riscv32nf" 32TUNE_PKGARCH:tune-riscv32nf = "riscv32nf"
33PACKAGE_EXTRA_ARCHS_tune-riscv32nf = "riscv32nf" 33PACKAGE_EXTRA_ARCHS:tune-riscv32nf = "riscv32nf"
diff --git a/meta/conf/machine/include/sh/README b/meta/conf/machine/include/sh/README
index b351acdd28..87d48b927b 100644
--- a/meta/conf/machine/include/sh/README
+++ b/meta/conf/machine/include/sh/README
@@ -5,7 +5,7 @@ Both big endian and little endian are defined for SH.
5 5
6Experimental -- SH tunings have not been validated. 6Experimental -- SH tunings have not been validated.
7 7
8The TUNE_ARCH is defined as ${TUNE_ARCH_tune-${DEFAULTTUNE}}. 8The TUNE_ARCH is defined as ${TUNE_ARCH:tune-${DEFAULTTUNE}}.
9 9
10The TUNE_PKGARCH is defind as ${TUNE_PKGARCH_tune-${DEFAULTTUNE}}. 10The TUNE_PKGARCH is defind as ${TUNE_PKGARCH:tune-${DEFAULTTUNE}}.
11 11
diff --git a/meta/conf/machine/include/sh/arch-sh.inc b/meta/conf/machine/include/sh/arch-sh.inc
index bdfbf52ca1..9d70e8511d 100644
--- a/meta/conf/machine/include/sh/arch-sh.inc
+++ b/meta/conf/machine/include/sh/arch-sh.inc
@@ -2,8 +2,8 @@
2 2
3DEFAULTTUNE ?= "sh" 3DEFAULTTUNE ?= "sh"
4 4
5TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}" 5TUNE_ARCH = "${TUNE_ARCH:tune-${DEFAULTTUNE}}"
6TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 6TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
7 7
8TUNEVALID[bigendian] = "Enabled big-endian mode." 8TUNEVALID[bigendian] = "Enabled big-endian mode."
9TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', ' -mb', ' -ml', d)}" 9TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', ' -mb', ' -ml', d)}"
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index 2bb8c7c154..b848580948 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -7,10 +7,10 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', ' -mcpu=arm1
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', 'armv6:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', 'armv6:', '', d)}"
8 8
9AVAILTUNES += "arm1136jfs arm1136jfshf" 9AVAILTUNES += "arm1136jfs arm1136jfshf"
10ARMPKGARCH_tune-arm1136jfs = "arm1136jfs" 10ARMPKGARCH:tune-arm1136jfs = "arm1136jfs"
11ARMPKGARCH_tune-arm1136jfshf = "arm1136jfs" 11ARMPKGARCH:tune-arm1136jfshf = "arm1136jfs"
12# mcpu is used so don't use armv6 as we don't want march 12# mcpu is used so don't use armv6 as we don't want march
13TUNE_FEATURES_tune-arm1136jfs = "arm vfp arm1136jfs" 13TUNE_FEATURES:tune-arm1136jfs = "arm vfp arm1136jfs"
14TUNE_FEATURES_tune-arm1136jfshf = "${TUNE_FEATURES_tune-arm1136jfs} callconvention-hard" 14TUNE_FEATURES:tune-arm1136jfshf = "${TUNE_FEATURES:tune-arm1136jfs} callconvention-hard"
15PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1136jfs-vfp" 15PACKAGE_EXTRA_ARCHS:tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1136jfs-vfp"
16PACKAGE_EXTRA_ARCHS_tune-arm1136jfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1136jfshf-vfp" 16PACKAGE_EXTRA_ARCHS:tune-arm1136jfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6hf} arm1136jfshf-vfp"
diff --git a/meta/conf/machine/include/tune-arm1176jz-s.inc b/meta/conf/machine/include/tune-arm1176jz-s.inc
index a74781f5e6..21d77f081e 100644
--- a/meta/conf/machine/include/tune-arm1176jz-s.inc
+++ b/meta/conf/machine/include/tune-arm1176jz-s.inc
@@ -7,11 +7,11 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', ' -mcpu=arm1
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', 'armv6:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', 'armv6:', '', d)}"
8 8
9AVAILTUNES += "arm1176jzs" 9AVAILTUNES += "arm1176jzs"
10ARMPKGARCH_tune-arm1176jzs = "arm1176jzs" 10ARMPKGARCH:tune-arm1176jzs = "arm1176jzs"
11TUNE_FEATURES_tune-arm1176jzs = "arm thumb arm1176jzs" 11TUNE_FEATURES:tune-arm1176jzs = "arm thumb arm1176jzs"
12PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6t-novfp} arm1176jzs arm1176jzst" 12PACKAGE_EXTRA_ARCHS:tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS:tune-armv6t-novfp} arm1176jzs arm1176jzst"
13 13
14AVAILTUNES += "arm1176jzs-be" 14AVAILTUNES += "arm1176jzs-be"
15ARMPKGARCH_tune-arm1176jzs-be = "${ARMPKGARCH_tune-arm1176jzs}" 15ARMPKGARCH:tune-arm1176jzs-be = "${ARMPKGARCH:tune-arm1176jzs}"
16TUNE_FEATURES_tune-arm1176jzs-be = "${TUNE_FEATURES_tune-arm1176jzs} bigendian" 16TUNE_FEATURES:tune-arm1176jzs-be = "${TUNE_FEATURES:tune-arm1176jzs} bigendian"
17PACKAGE_EXTRA_ARCHS_tune-arm1176jzs-be = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzsb arm1176jzstb" 17PACKAGE_EXTRA_ARCHS:tune-arm1176jzs-be = "${PACKAGE_EXTRA_ARCHS:tune-armv6tb-novfp} arm1176jzsb arm1176jzstb"
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 62a1a7e858..8a615792df 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -7,7 +7,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm920t', ' -mcpu=arm920t
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm920t', 'armv4:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm920t', 'armv4:', '', d)}"
8 8
9AVAILTUNES += "arm920t" 9AVAILTUNES += "arm920t"
10ARMPKGARCH_tune-arm920t = "arm920t" 10ARMPKGARCH:tune-arm920t = "arm920t"
11# mcpu is used so don't use armv4t as we don't want march 11# mcpu is used so don't use armv4t as we don't want march
12TUNE_FEATURES_tune-arm920t = "arm thumb arm920t" 12TUNE_FEATURES:tune-arm920t = "arm thumb arm920t"
13PACKAGE_EXTRA_ARCHS_tune-arm920t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} arm920t arm920tt" 13PACKAGE_EXTRA_ARCHS:tune-arm920t = "${PACKAGE_EXTRA_ARCHS:tune-armv4t} arm920t arm920tt"
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index 5f090ba2f8..84c5084868 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -7,7 +7,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm926ejs', ' -mcpu=arm92
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm926ejs', 'armv5:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm926ejs', 'armv5:', '', d)}"
8 8
9AVAILTUNES += "arm926ejs" 9AVAILTUNES += "arm926ejs"
10ARMPKGARCH_tune-arm926ejs = "arm926ejs" 10ARMPKGARCH:tune-arm926ejs = "arm926ejs"
11# mcpu is used so don't use armv5te as we don't want march 11# mcpu is used so don't use armv5te as we don't want march
12TUNE_FEATURES_tune-arm926ejs = "arm thumb dsp arm926ejs" 12TUNE_FEATURES:tune-arm926ejs = "arm thumb dsp arm926ejs"
13PACKAGE_EXTRA_ARCHS_tune-arm926ejs = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} arm926ejste arm926ejse" 13PACKAGE_EXTRA_ARCHS:tune-arm926ejs = "${PACKAGE_EXTRA_ARCHS:tune-armv5te} arm926ejste arm926ejse"
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index 8a46f8e5df..5ab286b576 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -7,7 +7,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm9tdmi', ' -mcpu=arm9td
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm9tdmi', 'armv4:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm9tdmi', 'armv4:', '', d)}"
8 8
9AVAILTUNES += "arm9tdmi" 9AVAILTUNES += "arm9tdmi"
10ARMPKGARCH_tune-arm9tdmi = "arm9tdmi" 10ARMPKGARCH:tune-arm9tdmi = "arm9tdmi"
11# mcpu is used so don't use armv4t as we don't want march 11# mcpu is used so don't use armv4t as we don't want march
12TUNE_FEATURES_tune-arm9tdmi = "arm thumb arm9tdmi" 12TUNE_FEATURES:tune-arm9tdmi = "arm thumb arm9tdmi"
13PACKAGE_EXTRA_ARCHS_tune-arm9tdmi = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} arm9tdmi arm9tdmit" 13PACKAGE_EXTRA_ARCHS:tune-arm9tdmi = "${PACKAGE_EXTRA_ARCHS:tune-armv4t} arm9tdmi arm9tdmit"
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index 1b272b2505..afae82541d 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -5,8 +5,8 @@ TUNECONFLICTS[c3] = "m64 mx32"
5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'c3', ' -march=c3 -mtune=c3', '', d)}" 5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'c3', ' -march=c3 -mtune=c3', '', d)}"
6 6
7AVAILTUNES += "c3" 7AVAILTUNES += "c3"
8TUNE_FEATURES_tune-c3 = "${TUNE_FEATURES_tune-x86} c3" 8TUNE_FEATURES:tune-c3 = "${TUNE_FEATURES:tune-x86} c3"
9BASE_LIBS_tune-c3 = "${BASE_LIB_tune-x86}" 9BASE_LIBS:tune-c3 = "${BASE_LIB:tune-x86}"
10# The following should likely be something other then i586... 10# The following should likely be something other then i586...
11TUNE_PKGARCH_tune-c3 = "i586" 11TUNE_PKGARCH:tune-c3 = "i586"
12PACKAGE_EXTRA_ARCHS_tune-c3 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586" 12PACKAGE_EXTRA_ARCHS:tune-c3 = "${PACKAGE_EXTRA_ARCHS:tune-x86} i386 i486 i586"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index ddde719bde..a551cad4d5 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -17,22 +17,22 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'core2', ' -march=core2 -m
17 17
18# Extra tune selections 18# Extra tune selections
19AVAILTUNES += "core2-32" 19AVAILTUNES += "core2-32"
20TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2" 20TUNE_FEATURES:tune-core2-32 = "${TUNE_FEATURES:tune-x86} core2"
21BASE_LIB_tune-core2-32 = "lib" 21BASE_LIB:tune-core2-32 = "lib"
22TUNE_PKGARCH_tune-core2-32 = "core2-32" 22TUNE_PKGARCH:tune-core2-32 = "core2-32"
23PACKAGE_EXTRA_ARCHS_tune-core2-32 = "${PACKAGE_EXTRA_ARCHS_tune-i686} core2-32" 23PACKAGE_EXTRA_ARCHS:tune-core2-32 = "${PACKAGE_EXTRA_ARCHS:tune-i686} core2-32"
24QEMU_EXTRAOPTIONS_core2-32 = " -cpu n270" 24QEMU_EXTRAOPTIONS_core2-32 = " -cpu n270"
25 25
26AVAILTUNES += "core2-64" 26AVAILTUNES += "core2-64"
27TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2" 27TUNE_FEATURES:tune-core2-64 = "${TUNE_FEATURES:tune-x86-64} core2"
28BASE_LIB_tune-core2-64 = "lib64" 28BASE_LIB:tune-core2-64 = "lib64"
29TUNE_PKGARCH_tune-core2-64 = "core2-64" 29TUNE_PKGARCH:tune-core2-64 = "core2-64"
30PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" 30PACKAGE_EXTRA_ARCHS:tune-core2-64 = "${PACKAGE_EXTRA_ARCHS:tune-x86-64} core2-64"
31QEMU_EXTRAOPTIONS_core2-64 = " -cpu core2duo" 31QEMU_EXTRAOPTIONS_core2-64 = " -cpu core2duo"
32 32
33AVAILTUNES += "core2-64-x32" 33AVAILTUNES += "core2-64-x32"
34TUNE_FEATURES_tune-core2-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} core2" 34TUNE_FEATURES:tune-core2-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} core2"
35BASE_LIB_tune-core2-64-x32 = "libx32" 35BASE_LIB:tune-core2-64-x32 = "libx32"
36TUNE_PKGARCH_tune-core2-64-x32 = "core2-64-x32" 36TUNE_PKGARCH:tune-core2-64-x32 = "core2-64-x32"
37PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" 37PACKAGE_EXTRA_ARCHS:tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-x86-64-x32} core2-64-x32"
38QEMU_EXTRAOPTIONS_core2-64-x32 = " -cpu core2duo" 38QEMU_EXTRAOPTIONS_core2-64-x32 = " -cpu core2duo"
diff --git a/meta/conf/machine/include/tune-corei7.inc b/meta/conf/machine/include/tune-corei7.inc
index d06af47b86..bf1ac7a93b 100644
--- a/meta/conf/machine/include/tune-corei7.inc
+++ b/meta/conf/machine/include/tune-corei7.inc
@@ -17,22 +17,22 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=nehalem
17 17
18# Extra tune selections 18# Extra tune selections
19AVAILTUNES += "corei7-32" 19AVAILTUNES += "corei7-32"
20TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7" 20TUNE_FEATURES:tune-corei7-32 = "${TUNE_FEATURES:tune-x86} corei7"
21BASE_LIB_tune-corei7-32 = "lib" 21BASE_LIB:tune-corei7-32 = "lib"
22TUNE_PKGARCH_tune-corei7-32 = "corei7-32" 22TUNE_PKGARCH:tune-corei7-32 = "corei7-32"
23PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32" 23PACKAGE_EXTRA_ARCHS:tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-32} corei7-32"
24QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false" 24QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false"
25 25
26AVAILTUNES += "corei7-64" 26AVAILTUNES += "corei7-64"
27TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7" 27TUNE_FEATURES:tune-corei7-64 = "${TUNE_FEATURES:tune-x86-64} corei7"
28BASE_LIB_tune-corei7-64 = "lib64" 28BASE_LIB:tune-corei7-64 = "lib64"
29TUNE_PKGARCH_tune-corei7-64 = "corei7-64" 29TUNE_PKGARCH:tune-corei7-64 = "corei7-64"
30PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" 30PACKAGE_EXTRA_ARCHS:tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64"
31QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false" 31QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false"
32 32
33AVAILTUNES += "corei7-64-x32" 33AVAILTUNES += "corei7-64-x32"
34TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7" 34TUNE_FEATURES:tune-corei7-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} corei7"
35BASE_LIB_tune-corei7-64-x32 = "libx32" 35BASE_LIB:tune-corei7-64-x32 = "libx32"
36TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32" 36TUNE_PKGARCH:tune-corei7-64-x32 = "corei7-64-x32"
37PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32" 37PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64-x32} corei7-64-x32"
38QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false" 38QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false"
diff --git a/meta/conf/machine/include/tune-cortex-m0.inc b/meta/conf/machine/include/tune-cortex-m0.inc
index a59c8af941..aadc5326ce 100644
--- a/meta/conf/machine/include/tune-cortex-m0.inc
+++ b/meta/conf/machine/include/tune-cortex-m0.inc
@@ -5,7 +5,7 @@ TUNEVALID[cortexm0] = "Enable Cortex-M0 specific processor optimizations"
5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0', ' -mcpu=cortex-m0', '', d)}" 5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0', ' -mcpu=cortex-m0', '', d)}"
6AVAILTUNES += "cortexm0" 6AVAILTUNES += "cortexm0"
7 7
8ARMPKGARCH_tune-cortexm0 = "cortexm0" 8ARMPKGARCH:tune-cortexm0 = "cortexm0"
9TUNE_FEATURES_tune-cortexm0 = "${TUNE_FEATURES_tune-armv6m} cortexm0" 9TUNE_FEATURES:tune-cortexm0 = "${TUNE_FEATURES:tune-armv6m} cortexm0"
10 10
11PACKAGE_EXTRA_ARCHS_tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0" 11PACKAGE_EXTRA_ARCHS:tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0"
diff --git a/meta/conf/machine/include/tune-cortex-m0plus.inc b/meta/conf/machine/include/tune-cortex-m0plus.inc
index 1c7512b061..a3cf3f0bd2 100644
--- a/meta/conf/machine/include/tune-cortex-m0plus.inc
+++ b/meta/conf/machine/include/tune-cortex-m0plus.inc
@@ -5,7 +5,7 @@ TUNEVALID[cortexm0-plus] = "Enable Cortex-M0 Plus specific processor optimizatio
5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0-plus', ' -mcpu=cortex-m0plus', '', d)}" 5TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0-plus', ' -mcpu=cortex-m0plus', '', d)}"
6AVAILTUNES += "cortexm0-plus" 6AVAILTUNES += "cortexm0-plus"
7 7
8ARMPKGARCH_tune-cortexm0-plus = "cortexm0-plus" 8ARMPKGARCH:tune-cortexm0-plus = "cortexm0-plus"
9TUNE_FEATURES_tune-cortexm0-plus = "${TUNE_FEATURES_tune-armv6m} cortexm0-plus" 9TUNE_FEATURES:tune-cortexm0-plus = "${TUNE_FEATURES:tune-armv6m} cortexm0-plus"
10 10
11PACKAGE_EXTRA_ARCHS_tune-cortexm0-plus = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0-plus" 11PACKAGE_EXTRA_ARCHS:tune-cortexm0-plus = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-plus"
diff --git a/meta/conf/machine/include/tune-cortexa15.inc b/meta/conf/machine/include/tune-cortexa15.inc
index 0457c2d9fa..66bc124dc0 100644
--- a/meta/conf/machine/include/tune-cortexa15.inc
+++ b/meta/conf/machine/include/tune-cortexa15.inc
@@ -8,44 +8,44 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa15', 'armv7ve
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa15 cortexa15t cortexa15-neon cortexa15t-neon cortexa15-neon-vfpv4 cortexa15t-neon-vfpv4" 10AVAILTUNES += "cortexa15 cortexa15t cortexa15-neon cortexa15t-neon cortexa15-neon-vfpv4 cortexa15t-neon-vfpv4"
11ARMPKGARCH_tune-cortexa15 = "cortexa15" 11ARMPKGARCH:tune-cortexa15 = "cortexa15"
12ARMPKGARCH_tune-cortexa15t = "cortexa15" 12ARMPKGARCH:tune-cortexa15t = "cortexa15"
13ARMPKGARCH_tune-cortexa15-neon = "cortexa15" 13ARMPKGARCH:tune-cortexa15-neon = "cortexa15"
14ARMPKGARCH_tune-cortexa15t-neon = "cortexa15" 14ARMPKGARCH:tune-cortexa15t-neon = "cortexa15"
15ARMPKGARCH_tune-cortexa15-neon-vfpv4 = "cortexa15" 15ARMPKGARCH:tune-cortexa15-neon-vfpv4 = "cortexa15"
16ARMPKGARCH_tune-cortexa15t-neon-vfpv4 = "cortexa15" 16ARMPKGARCH:tune-cortexa15t-neon-vfpv4 = "cortexa15"
17# mcpu is used so don't use armv7ve as we don't want march 17# mcpu is used so don't use armv7ve as we don't want march
18TUNE_FEATURES_tune-cortexa15 = "arm vfp cortexa15" 18TUNE_FEATURES:tune-cortexa15 = "arm vfp cortexa15"
19TUNE_FEATURES_tune-cortexa15t = "${TUNE_FEATURES_tune-cortexa15} thumb" 19TUNE_FEATURES:tune-cortexa15t = "${TUNE_FEATURES:tune-cortexa15} thumb"
20TUNE_FEATURES_tune-cortexa15-neon = "${TUNE_FEATURES_tune-cortexa15} neon" 20TUNE_FEATURES:tune-cortexa15-neon = "${TUNE_FEATURES:tune-cortexa15} neon"
21TUNE_FEATURES_tune-cortexa15t-neon = "${TUNE_FEATURES_tune-cortexa15-neon} thumb" 21TUNE_FEATURES:tune-cortexa15t-neon = "${TUNE_FEATURES:tune-cortexa15-neon} thumb"
22TUNE_FEATURES_tune-cortexa15-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa15-neon} vfpv4" 22TUNE_FEATURES:tune-cortexa15-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa15-neon} vfpv4"
23TUNE_FEATURES_tune-cortexa15t-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa15-neon-vfpv4} thumb" 23TUNE_FEATURES:tune-cortexa15t-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa15-neon-vfpv4} thumb"
24PACKAGE_EXTRA_ARCHS_tune-cortexa15 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa15-vfp" 24PACKAGE_EXTRA_ARCHS:tune-cortexa15 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} cortexa15-vfp"
25PACKAGE_EXTRA_ARCHS_tune-cortexa15t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa15-vfp cortexa15t2-vfp" 25PACKAGE_EXTRA_ARCHS:tune-cortexa15t = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} cortexa15-vfp cortexa15t2-vfp"
26PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa15-vfp cortexa15-neon" 26PACKAGE_EXTRA_ARCHS:tune-cortexa15-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon} cortexa15-vfp cortexa15-neon"
27PACKAGE_EXTRA_ARCHS_tune-cortexa15t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa15-vfp cortexa15-neon cortexa15t2-vfp cortexa15t2-neon" 27PACKAGE_EXTRA_ARCHS:tune-cortexa15t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon} cortexa15-vfp cortexa15-neon cortexa15t2-vfp cortexa15t2-neon"
28PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4" 28PACKAGE_EXTRA_ARCHS:tune-cortexa15-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4"
29PACKAGE_EXTRA_ARCHS_tune-cortexa15t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4 cortexa15t2-vfp cortexa15t2-neon cortexa15t2-neon-vfpv4" 29PACKAGE_EXTRA_ARCHS:tune-cortexa15t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4 cortexa15t2-vfp cortexa15t2-neon cortexa15t2-neon-vfpv4"
30 30
31# HF Tunes 31# HF Tunes
32AVAILTUNES += "cortexa15hf cortexa15thf cortexa15hf-neon cortexa15thf-neon cortexa15hf-neon-vfpv4 cortexa15thf-neon-vfpv4" 32AVAILTUNES += "cortexa15hf cortexa15thf cortexa15hf-neon cortexa15thf-neon cortexa15hf-neon-vfpv4 cortexa15thf-neon-vfpv4"
33ARMPKGARCH_tune-cortexa15hf = "cortexa15" 33ARMPKGARCH:tune-cortexa15hf = "cortexa15"
34ARMPKGARCH_tune-cortexa15thf = "cortexa15" 34ARMPKGARCH:tune-cortexa15thf = "cortexa15"
35ARMPKGARCH_tune-cortexa15hf-neon = "cortexa15" 35ARMPKGARCH:tune-cortexa15hf-neon = "cortexa15"
36ARMPKGARCH_tune-cortexa15thf-neon = "cortexa15" 36ARMPKGARCH:tune-cortexa15thf-neon = "cortexa15"
37ARMPKGARCH_tune-cortexa15hf-neon-vfpv4 = "cortexa15" 37ARMPKGARCH:tune-cortexa15hf-neon-vfpv4 = "cortexa15"
38ARMPKGARCH_tune-cortexa15thf-neon-vfpv4 = "cortexa15" 38ARMPKGARCH:tune-cortexa15thf-neon-vfpv4 = "cortexa15"
39# mcpu is used so don't use armv7ve as we don't want march 39# mcpu is used so don't use armv7ve as we don't want march
40TUNE_FEATURES_tune-cortexa15hf = "${TUNE_FEATURES_tune-cortexa15} callconvention-hard" 40TUNE_FEATURES:tune-cortexa15hf = "${TUNE_FEATURES:tune-cortexa15} callconvention-hard"
41TUNE_FEATURES_tune-cortexa15thf = "${TUNE_FEATURES_tune-cortexa15t} callconvention-hard" 41TUNE_FEATURES:tune-cortexa15thf = "${TUNE_FEATURES:tune-cortexa15t} callconvention-hard"
42TUNE_FEATURES_tune-cortexa15hf-neon = "${TUNE_FEATURES_tune-cortexa15-neon} callconvention-hard" 42TUNE_FEATURES:tune-cortexa15hf-neon = "${TUNE_FEATURES:tune-cortexa15-neon} callconvention-hard"
43TUNE_FEATURES_tune-cortexa15thf-neon = "${TUNE_FEATURES_tune-cortexa15t-neon} callconvention-hard" 43TUNE_FEATURES:tune-cortexa15thf-neon = "${TUNE_FEATURES:tune-cortexa15t-neon} callconvention-hard"
44TUNE_FEATURES_tune-cortexa15hf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa15-neon-vfpv4} callconvention-hard" 44TUNE_FEATURES:tune-cortexa15hf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa15-neon-vfpv4} callconvention-hard"
45TUNE_FEATURES_tune-cortexa15thf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa15t-neon-vfpv4} callconvention-hard" 45TUNE_FEATURES:tune-cortexa15thf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa15t-neon-vfpv4} callconvention-hard"
46PACKAGE_EXTRA_ARCHS_tune-cortexa15hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa15hf-vfp" 46PACKAGE_EXTRA_ARCHS:tune-cortexa15hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} cortexa15hf-vfp"
47PACKAGE_EXTRA_ARCHS_tune-cortexa15thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa15hf-vfp cortexa15t2hf-vfp" 47PACKAGE_EXTRA_ARCHS:tune-cortexa15thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} cortexa15hf-vfp cortexa15t2hf-vfp"
48PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa15hf-vfp cortexa15hf-neon" 48PACKAGE_EXTRA_ARCHS:tune-cortexa15hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon} cortexa15hf-vfp cortexa15hf-neon"
49PACKAGE_EXTRA_ARCHS_tune-cortexa15thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa15hf-vfp cortexa15hf-neon cortexa15t2hf-vfp cortexa15t2hf-neon" 49PACKAGE_EXTRA_ARCHS:tune-cortexa15thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon} cortexa15hf-vfp cortexa15hf-neon cortexa15t2hf-vfp cortexa15t2hf-neon"
50PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4" 50PACKAGE_EXTRA_ARCHS:tune-cortexa15hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4"
51PACKAGE_EXTRA_ARCHS_tune-cortexa15thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4 cortexa15t2hf-vfp cortexa15t2hf-neon cortexa15t2hf-neon-vfpv4" 51PACKAGE_EXTRA_ARCHS:tune-cortexa15thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4 cortexa15t2hf-vfp cortexa15t2hf-neon cortexa15t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa17.inc b/meta/conf/machine/include/tune-cortexa17.inc
index 6a2107f653..324673d440 100644
--- a/meta/conf/machine/include/tune-cortexa17.inc
+++ b/meta/conf/machine/include/tune-cortexa17.inc
@@ -8,44 +8,44 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa17', 'armv7ve
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa17 cortexa17t cortexa17-neon cortexa17t-neon cortexa17-neon-vfpv4 cortexa17t-neon-vfpv4" 10AVAILTUNES += "cortexa17 cortexa17t cortexa17-neon cortexa17t-neon cortexa17-neon-vfpv4 cortexa17t-neon-vfpv4"
11ARMPKGARCH_tune-cortexa17 = "cortexa17" 11ARMPKGARCH:tune-cortexa17 = "cortexa17"
12ARMPKGARCH_tune-cortexa17t = "cortexa17" 12ARMPKGARCH:tune-cortexa17t = "cortexa17"
13ARMPKGARCH_tune-cortexa17-neon = "cortexa17" 13ARMPKGARCH:tune-cortexa17-neon = "cortexa17"
14ARMPKGARCH_tune-cortexa17t-neon = "cortexa17" 14ARMPKGARCH:tune-cortexa17t-neon = "cortexa17"
15ARMPKGARCH_tune-cortexa17-neon-vfpv4 = "cortexa17" 15ARMPKGARCH:tune-cortexa17-neon-vfpv4 = "cortexa17"
16ARMPKGARCH_tune-cortexa17t-neon-vfpv4 = "cortexa17" 16ARMPKGARCH:tune-cortexa17t-neon-vfpv4 = "cortexa17"
17# mcpu is used so don't use armv7ve as we don't want march 17# mcpu is used so don't use armv7ve as we don't want march
18TUNE_FEATURES_tune-cortexa17 = "arm vfp cortexa17" 18TUNE_FEATURES:tune-cortexa17 = "arm vfp cortexa17"
19TUNE_FEATURES_tune-cortexa17t = "${TUNE_FEATURES_tune-cortexa17} thumb" 19TUNE_FEATURES:tune-cortexa17t = "${TUNE_FEATURES:tune-cortexa17} thumb"
20TUNE_FEATURES_tune-cortexa17-neon = "${TUNE_FEATURES_tune-cortexa17} neon" 20TUNE_FEATURES:tune-cortexa17-neon = "${TUNE_FEATURES:tune-cortexa17} neon"
21TUNE_FEATURES_tune-cortexa17t-neon = "${TUNE_FEATURES_tune-cortexa17-neon} thumb" 21TUNE_FEATURES:tune-cortexa17t-neon = "${TUNE_FEATURES:tune-cortexa17-neon} thumb"
22TUNE_FEATURES_tune-cortexa17-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa17-neon} vfpv4" 22TUNE_FEATURES:tune-cortexa17-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa17-neon} vfpv4"
23TUNE_FEATURES_tune-cortexa17t-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa17-neon-vfpv4} thumb" 23TUNE_FEATURES:tune-cortexa17t-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa17-neon-vfpv4} thumb"
24PACKAGE_EXTRA_ARCHS_tune-cortexa17 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa17-vfp" 24PACKAGE_EXTRA_ARCHS:tune-cortexa17 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} cortexa17-vfp"
25PACKAGE_EXTRA_ARCHS_tune-cortexa17t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa17-vfp cortexa17t2-vfp" 25PACKAGE_EXTRA_ARCHS:tune-cortexa17t = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} cortexa17-vfp cortexa17t2-vfp"
26PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa17-vfp cortexa17-neon" 26PACKAGE_EXTRA_ARCHS:tune-cortexa17-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon} cortexa17-vfp cortexa17-neon"
27PACKAGE_EXTRA_ARCHS_tune-cortexa17t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa17-vfp cortexa17-neon cortexa17t2-vfp cortexa17t2-neon" 27PACKAGE_EXTRA_ARCHS:tune-cortexa17t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon} cortexa17-vfp cortexa17-neon cortexa17t2-vfp cortexa17t2-neon"
28PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4" 28PACKAGE_EXTRA_ARCHS:tune-cortexa17-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4"
29PACKAGE_EXTRA_ARCHS_tune-cortexa17t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4 cortexa17t2-vfp cortexa17t2-neon cortexa17t2-neon-vfpv4" 29PACKAGE_EXTRA_ARCHS:tune-cortexa17t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4 cortexa17t2-vfp cortexa17t2-neon cortexa17t2-neon-vfpv4"
30 30
31# HF Tunes 31# HF Tunes
32AVAILTUNES += "cortexa17hf cortexa17thf cortexa17hf-neon cortexa17thf-neon cortexa17hf-neon-vfpv4 cortexa17thf-neon-vfpv4" 32AVAILTUNES += "cortexa17hf cortexa17thf cortexa17hf-neon cortexa17thf-neon cortexa17hf-neon-vfpv4 cortexa17thf-neon-vfpv4"
33ARMPKGARCH_tune-cortexa17hf = "cortexa17" 33ARMPKGARCH:tune-cortexa17hf = "cortexa17"
34ARMPKGARCH_tune-cortexa17thf = "cortexa17" 34ARMPKGARCH:tune-cortexa17thf = "cortexa17"
35ARMPKGARCH_tune-cortexa17hf-neon = "cortexa17" 35ARMPKGARCH:tune-cortexa17hf-neon = "cortexa17"
36ARMPKGARCH_tune-cortexa17thf-neon = "cortexa17" 36ARMPKGARCH:tune-cortexa17thf-neon = "cortexa17"
37ARMPKGARCH_tune-cortexa17hf-neon-vfpv4 = "cortexa17" 37ARMPKGARCH:tune-cortexa17hf-neon-vfpv4 = "cortexa17"
38ARMPKGARCH_tune-cortexa17thf-neon-vfpv4 = "cortexa17" 38ARMPKGARCH:tune-cortexa17thf-neon-vfpv4 = "cortexa17"
39# mcpu is used so don't use armv7ve as we don't want march 39# mcpu is used so don't use armv7ve as we don't want march
40TUNE_FEATURES_tune-cortexa17hf = "${TUNE_FEATURES_tune-cortexa17} callconvention-hard" 40TUNE_FEATURES:tune-cortexa17hf = "${TUNE_FEATURES:tune-cortexa17} callconvention-hard"
41TUNE_FEATURES_tune-cortexa17thf = "${TUNE_FEATURES_tune-cortexa17t} callconvention-hard" 41TUNE_FEATURES:tune-cortexa17thf = "${TUNE_FEATURES:tune-cortexa17t} callconvention-hard"
42TUNE_FEATURES_tune-cortexa17hf-neon = "${TUNE_FEATURES_tune-cortexa17-neon} callconvention-hard" 42TUNE_FEATURES:tune-cortexa17hf-neon = "${TUNE_FEATURES:tune-cortexa17-neon} callconvention-hard"
43TUNE_FEATURES_tune-cortexa17thf-neon = "${TUNE_FEATURES_tune-cortexa17t-neon} callconvention-hard" 43TUNE_FEATURES:tune-cortexa17thf-neon = "${TUNE_FEATURES:tune-cortexa17t-neon} callconvention-hard"
44TUNE_FEATURES_tune-cortexa17hf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa17-neon-vfpv4} callconvention-hard" 44TUNE_FEATURES:tune-cortexa17hf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa17-neon-vfpv4} callconvention-hard"
45TUNE_FEATURES_tune-cortexa17thf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa17t-neon-vfpv4} callconvention-hard" 45TUNE_FEATURES:tune-cortexa17thf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa17t-neon-vfpv4} callconvention-hard"
46PACKAGE_EXTRA_ARCHS_tune-cortexa17hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa17hf-vfp" 46PACKAGE_EXTRA_ARCHS:tune-cortexa17hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} cortexa17hf-vfp"
47PACKAGE_EXTRA_ARCHS_tune-cortexa17thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa17hf-vfp cortexa17t2hf-vfp" 47PACKAGE_EXTRA_ARCHS:tune-cortexa17thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} cortexa17hf-vfp cortexa17t2hf-vfp"
48PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa17hf-vfp cortexa17hf-neon" 48PACKAGE_EXTRA_ARCHS:tune-cortexa17hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon} cortexa17hf-vfp cortexa17hf-neon"
49PACKAGE_EXTRA_ARCHS_tune-cortexa17thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa17hf-vfp cortexa17hf-neon cortexa17t2hf-vfp cortexa17t2hf-neon" 49PACKAGE_EXTRA_ARCHS:tune-cortexa17thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon} cortexa17hf-vfp cortexa17hf-neon cortexa17t2hf-vfp cortexa17t2hf-neon"
50PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4" 50PACKAGE_EXTRA_ARCHS:tune-cortexa17hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4"
51PACKAGE_EXTRA_ARCHS_tune-cortexa17thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4 cortexa17t2hf-vfp cortexa17t2hf-neon cortexa17t2hf-neon-vfpv4" 51PACKAGE_EXTRA_ARCHS:tune-cortexa17thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4 cortexa17t2hf-vfp cortexa17t2hf-neon cortexa17t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa32.inc b/meta/conf/machine/include/tune-cortexa32.inc
index b9ae2b1c57..c7b01a2906 100644
--- a/meta/conf/machine/include/tune-cortexa32.inc
+++ b/meta/conf/machine/include/tune-cortexa32.inc
@@ -7,11 +7,11 @@ require conf/machine/include/arm/arch-armv8a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa32 cortexa32-crypto" 9AVAILTUNES += "cortexa32 cortexa32-crypto"
10ARMPKGARCH_tune-cortexa32 = "cortexa32" 10ARMPKGARCH:tune-cortexa32 = "cortexa32"
11ARMPKGARCH_tune-cortexa32-crypto = "cortexa32" 11ARMPKGARCH:tune-cortexa32-crypto = "cortexa32"
12TUNE_FEATURES_tune-cortexa32 = "armv8a cortexa32 crc callconvention-hard neon" 12TUNE_FEATURES:tune-cortexa32 = "armv8a cortexa32 crc callconvention-hard neon"
13TUNE_FEATURES_tune-cortexa32-crypto = "${TUNE_FEATURES_tune-cortexa32} crypto" 13TUNE_FEATURES:tune-cortexa32-crypto = "${TUNE_FEATURES:tune-cortexa32} crypto"
14PACKAGE_EXTRA_ARCHS_tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa32 cortexa32hf-neon" 14PACKAGE_EXTRA_ARCHS:tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa32 cortexa32hf-neon"
15PACKAGE_EXTRA_ARCHS_tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto" 15PACKAGE_EXTRA_ARCHS:tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto"
16BASE_LIB_tune-cortexa32 = "lib" 16BASE_LIB:tune-cortexa32 = "lib"
17BASE_LIB_tune-cortexa32-crypto = "lib" 17BASE_LIB:tune-cortexa32-crypto = "lib"
diff --git a/meta/conf/machine/include/tune-cortexa35.inc b/meta/conf/machine/include/tune-cortexa35.inc
index cb3ad4c11e..33afb19386 100644
--- a/meta/conf/machine/include/tune-cortexa35.inc
+++ b/meta/conf/machine/include/tune-cortexa35.inc
@@ -7,11 +7,11 @@ require conf/machine/include/arm/arch-armv8a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa35 cortexa35-crypto" 9AVAILTUNES += "cortexa35 cortexa35-crypto"
10ARMPKGARCH_tune-cortexa35 = "cortexa35" 10ARMPKGARCH:tune-cortexa35 = "cortexa35"
11ARMPKGARCH_tune-cortexa35-crypto = "cortexa35" 11ARMPKGARCH:tune-cortexa35-crypto = "cortexa35"
12TUNE_FEATURES_tune-cortexa35 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa35" 12TUNE_FEATURES:tune-cortexa35 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa35"
13TUNE_FEATURES_tune-cortexa35-crypto = "${TUNE_FEATURES_tune-cortexa35} crypto" 13TUNE_FEATURES:tune-cortexa35-crypto = "${TUNE_FEATURES:tune-cortexa35} crypto"
14PACKAGE_EXTRA_ARCHS_tune-cortexa35 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa35" 14PACKAGE_EXTRA_ARCHS:tune-cortexa35 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa35"
15PACKAGE_EXTRA_ARCHS_tune-cortexa35-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa35 cortexa35-crypto" 15PACKAGE_EXTRA_ARCHS:tune-cortexa35-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa35 cortexa35-crypto"
16BASE_LIB_tune-cortexa35 = "lib64" 16BASE_LIB:tune-cortexa35 = "lib64"
17BASE_LIB_tune-cortexa35-crypto = "lib64" 17BASE_LIB:tune-cortexa35-crypto = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa5.inc b/meta/conf/machine/include/tune-cortexa5.inc
index 923b758c41..817eb166d6 100644
--- a/meta/conf/machine/include/tune-cortexa5.inc
+++ b/meta/conf/machine/include/tune-cortexa5.inc
@@ -8,44 +8,44 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa5', 'armv7a:'
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa5 cortexa5t cortexa5-neon cortexa5t-neon cortexa5-neon-vfpv4 cortexa5t-neon-vfpv4" 10AVAILTUNES += "cortexa5 cortexa5t cortexa5-neon cortexa5t-neon cortexa5-neon-vfpv4 cortexa5t-neon-vfpv4"
11ARMPKGARCH_tune-cortexa5 = "cortexa5" 11ARMPKGARCH:tune-cortexa5 = "cortexa5"
12ARMPKGARCH_tune-cortexa5t = "cortexa5" 12ARMPKGARCH:tune-cortexa5t = "cortexa5"
13ARMPKGARCH_tune-cortexa5-neon = "cortexa5" 13ARMPKGARCH:tune-cortexa5-neon = "cortexa5"
14ARMPKGARCH_tune-cortexa5t-neon = "cortexa5" 14ARMPKGARCH:tune-cortexa5t-neon = "cortexa5"
15ARMPKGARCH_tune-cortexa5-neon-vfpv4 = "cortexa5" 15ARMPKGARCH:tune-cortexa5-neon-vfpv4 = "cortexa5"
16ARMPKGARCH_tune-cortexa5t-neon-vfpv4 = "cortexa5" 16ARMPKGARCH:tune-cortexa5t-neon-vfpv4 = "cortexa5"
17# mcpu is used so don't use armv7a as we don't want march 17# mcpu is used so don't use armv7a as we don't want march
18TUNE_FEATURES_tune-cortexa5 = "arm vfp cortexa5" 18TUNE_FEATURES:tune-cortexa5 = "arm vfp cortexa5"
19TUNE_FEATURES_tune-cortexa5t = "${TUNE_FEATURES_tune-cortexa5} thumb" 19TUNE_FEATURES:tune-cortexa5t = "${TUNE_FEATURES:tune-cortexa5} thumb"
20TUNE_FEATURES_tune-cortexa5-neon = "${TUNE_FEATURES_tune-cortexa5} neon" 20TUNE_FEATURES:tune-cortexa5-neon = "${TUNE_FEATURES:tune-cortexa5} neon"
21TUNE_FEATURES_tune-cortexa5t-neon = "${TUNE_FEATURES_tune-cortexa5-neon} thumb" 21TUNE_FEATURES:tune-cortexa5t-neon = "${TUNE_FEATURES:tune-cortexa5-neon} thumb"
22TUNE_FEATURES_tune-cortexa5-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa5-neon} vfpv4" 22TUNE_FEATURES:tune-cortexa5-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa5-neon} vfpv4"
23TUNE_FEATURES_tune-cortexa5t-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa5-neon-vfpv4} thumb" 23TUNE_FEATURES:tune-cortexa5t-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa5-neon-vfpv4} thumb"
24PACKAGE_EXTRA_ARCHS_tune-cortexa5 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa5-vfp" 24PACKAGE_EXTRA_ARCHS:tune-cortexa5 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} cortexa5-vfp"
25PACKAGE_EXTRA_ARCHS_tune-cortexa5t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa5-vfp cortexa5t2-vfp" 25PACKAGE_EXTRA_ARCHS:tune-cortexa5t = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} cortexa5-vfp cortexa5t2-vfp"
26PACKAGE_EXTRA_ARCHS_tune-cortexa5-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa5-vfp cortexa5-neon" 26PACKAGE_EXTRA_ARCHS:tune-cortexa5-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-neon} cortexa5-vfp cortexa5-neon"
27PACKAGE_EXTRA_ARCHS_tune-cortexa5t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa5-vfp cortexa5-neon cortexa5t2-vfp cortexa5t2-neon" 27PACKAGE_EXTRA_ARCHS:tune-cortexa5t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-neon} cortexa5-vfp cortexa5-neon cortexa5t2-vfp cortexa5t2-neon"
28PACKAGE_EXTRA_ARCHS_tune-cortexa5-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon-vfpv4} cortexa5-vfp cortexa5-neon cortexa5-neon-vfpv4" 28PACKAGE_EXTRA_ARCHS:tune-cortexa5-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-neon-vfpv4} cortexa5-vfp cortexa5-neon cortexa5-neon-vfpv4"
29PACKAGE_EXTRA_ARCHS_tune-cortexa5t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon-vfpv4} cortexa5-vfp cortexa5-neon cortexa5-neon-vfpv4 cortexa5t2-vfp cortexa5t2-neon cortexa5t2-neon-vfpv4" 29PACKAGE_EXTRA_ARCHS:tune-cortexa5t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-neon-vfpv4} cortexa5-vfp cortexa5-neon cortexa5-neon-vfpv4 cortexa5t2-vfp cortexa5t2-neon cortexa5t2-neon-vfpv4"
30 30
31# HF Tunes 31# HF Tunes
32AVAILTUNES += "cortexa5hf cortexa5thf cortexa5hf-neon cortexa5thf-neon cortexa5hf-neon-vfpv4 cortexa5thf-neon-vfpv4" 32AVAILTUNES += "cortexa5hf cortexa5thf cortexa5hf-neon cortexa5thf-neon cortexa5hf-neon-vfpv4 cortexa5thf-neon-vfpv4"
33ARMPKGARCH_tune-cortexa5hf = "cortexa5" 33ARMPKGARCH:tune-cortexa5hf = "cortexa5"
34ARMPKGARCH_tune-cortexa5thf = "cortexa5" 34ARMPKGARCH:tune-cortexa5thf = "cortexa5"
35ARMPKGARCH_tune-cortexa5hf-neon = "cortexa5" 35ARMPKGARCH:tune-cortexa5hf-neon = "cortexa5"
36ARMPKGARCH_tune-cortexa5thf-neon = "cortexa5" 36ARMPKGARCH:tune-cortexa5thf-neon = "cortexa5"
37ARMPKGARCH_tune-cortexa5hf-neon-vfpv4 = "cortexa5" 37ARMPKGARCH:tune-cortexa5hf-neon-vfpv4 = "cortexa5"
38ARMPKGARCH_tune-cortexa5thf-neon-vfpv4 = "cortexa5" 38ARMPKGARCH:tune-cortexa5thf-neon-vfpv4 = "cortexa5"
39# mcpu is used so don't use armv7a as we don't want march 39# mcpu is used so don't use armv7a as we don't want march
40TUNE_FEATURES_tune-cortexa5hf = "${TUNE_FEATURES_tune-cortexa5} callconvention-hard" 40TUNE_FEATURES:tune-cortexa5hf = "${TUNE_FEATURES:tune-cortexa5} callconvention-hard"
41TUNE_FEATURES_tune-cortexa5thf = "${TUNE_FEATURES_tune-cortexa5t} callconvention-hard" 41TUNE_FEATURES:tune-cortexa5thf = "${TUNE_FEATURES:tune-cortexa5t} callconvention-hard"
42TUNE_FEATURES_tune-cortexa5hf-neon = "${TUNE_FEATURES_tune-cortexa5-neon} callconvention-hard" 42TUNE_FEATURES:tune-cortexa5hf-neon = "${TUNE_FEATURES:tune-cortexa5-neon} callconvention-hard"
43TUNE_FEATURES_tune-cortexa5thf-neon = "${TUNE_FEATURES_tune-cortexa5t-neon} callconvention-hard" 43TUNE_FEATURES:tune-cortexa5thf-neon = "${TUNE_FEATURES:tune-cortexa5t-neon} callconvention-hard"
44TUNE_FEATURES_tune-cortexa5hf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa5-neon-vfpv4} callconvention-hard" 44TUNE_FEATURES:tune-cortexa5hf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa5-neon-vfpv4} callconvention-hard"
45TUNE_FEATURES_tune-cortexa5thf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa5t-neon-vfpv4} callconvention-hard" 45TUNE_FEATURES:tune-cortexa5thf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa5t-neon-vfpv4} callconvention-hard"
46PACKAGE_EXTRA_ARCHS_tune-cortexa5hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa5hf-vfp" 46PACKAGE_EXTRA_ARCHS:tune-cortexa5hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} cortexa5hf-vfp"
47PACKAGE_EXTRA_ARCHS_tune-cortexa5thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa5hf-vfp cortexa5t2hf-vfp" 47PACKAGE_EXTRA_ARCHS:tune-cortexa5thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} cortexa5hf-vfp cortexa5t2hf-vfp"
48PACKAGE_EXTRA_ARCHS_tune-cortexa5hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa5hf-vfp cortexa5hf-neon" 48PACKAGE_EXTRA_ARCHS:tune-cortexa5hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon} cortexa5hf-vfp cortexa5hf-neon"
49PACKAGE_EXTRA_ARCHS_tune-cortexa5thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa5hf-vfp cortexa5hf-neon cortexa5t2hf-vfp cortexa5t2hf-neon" 49PACKAGE_EXTRA_ARCHS:tune-cortexa5thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon} cortexa5hf-vfp cortexa5hf-neon cortexa5t2hf-vfp cortexa5t2hf-neon"
50PACKAGE_EXTRA_ARCHS_tune-cortexa5hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon-vfpv4} cortexa5hf-vfp cortexa5hf-neon cortexa5hf-neon-vfpv4" 50PACKAGE_EXTRA_ARCHS:tune-cortexa5hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon-vfpv4} cortexa5hf-vfp cortexa5hf-neon cortexa5hf-neon-vfpv4"
51PACKAGE_EXTRA_ARCHS_tune-cortexa5thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon-vfpv4} cortexa5hf-vfp cortexa5hf-neon cortexa5hf-neon-vfpv4 cortexa5t2hf-vfp cortexa5t2hf-neon cortexa5t2hf-neon-vfpv4" 51PACKAGE_EXTRA_ARCHS:tune-cortexa5thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon-vfpv4} cortexa5hf-vfp cortexa5hf-neon cortexa5hf-neon-vfpv4 cortexa5t2hf-vfp cortexa5t2hf-neon cortexa5t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa53.inc b/meta/conf/machine/include/tune-cortexa53.inc
index 7f8863a2fa..a534ad358d 100644
--- a/meta/conf/machine/include/tune-cortexa53.inc
+++ b/meta/conf/machine/include/tune-cortexa53.inc
@@ -7,11 +7,11 @@ require conf/machine/include/arm/arch-armv8a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa53 cortexa53-crypto" 9AVAILTUNES += "cortexa53 cortexa53-crypto"
10ARMPKGARCH_tune-cortexa53 = "cortexa53" 10ARMPKGARCH:tune-cortexa53 = "cortexa53"
11ARMPKGARCH_tune-cortexa53-crypto = "cortexa53-crypto" 11ARMPKGARCH:tune-cortexa53-crypto = "cortexa53-crypto"
12TUNE_FEATURES_tune-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa53" 12TUNE_FEATURES:tune-cortexa53 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa53"
13TUNE_FEATURES_tune-cortexa53-crypto = "${TUNE_FEATURES_tune-cortexa53} crypto" 13TUNE_FEATURES:tune-cortexa53-crypto = "${TUNE_FEATURES:tune-cortexa53} crypto"
14PACKAGE_EXTRA_ARCHS_tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa53" 14PACKAGE_EXTRA_ARCHS:tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa53"
15PACKAGE_EXTRA_ARCHS_tune-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa53 cortexa53-crypto" 15PACKAGE_EXTRA_ARCHS:tune-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa53 cortexa53-crypto"
16BASE_LIB_tune-cortexa53 = "lib64" 16BASE_LIB:tune-cortexa53 = "lib64"
17BASE_LIB_tune-cortexa53-crypto = "lib64" 17BASE_LIB:tune-cortexa53-crypto = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa55.inc b/meta/conf/machine/include/tune-cortexa55.inc
index e9629738f3..d130b4b90a 100644
--- a/meta/conf/machine/include/tune-cortexa55.inc
+++ b/meta/conf/machine/include/tune-cortexa55.inc
@@ -7,7 +7,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa55" 9AVAILTUNES += "cortexa55"
10ARMPKGARCH_tune-cortexa55 = "cortexa55" 10ARMPKGARCH:tune-cortexa55 = "cortexa55"
11TUNE_FEATURES_tune-cortexa55 = "${TUNE_FEATURES_tune-armv8-2a-crypto} cortexa55" 11TUNE_FEATURES:tune-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa55"
12PACKAGE_EXTRA_ARCHS_tune-cortexa55 = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto} cortexa55" 12PACKAGE_EXTRA_ARCHS:tune-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa55"
13BASE_LIB_tune-cortexa55 = "lib64" 13BASE_LIB:tune-cortexa55 = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc b/meta/conf/machine/include/tune-cortexa57-cortexa53.inc
index d329d6199f..7de671a2e5 100644
--- a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc
+++ b/meta/conf/machine/include/tune-cortexa57-cortexa53.inc
@@ -8,7 +8,7 @@ require conf/machine/include/arm/arch-armv8a.inc
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa57-cortexa53" 10AVAILTUNES += "cortexa57-cortexa53"
11ARMPKGARCH_tune-cortexa57-cortexa53 = "cortexa57-cortexa53" 11ARMPKGARCH:tune-cortexa57-cortexa53 = "cortexa57-cortexa53"
12TUNE_FEATURES_tune-cortexa57-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa57-cortexa53" 12TUNE_FEATURES:tune-cortexa57-cortexa53 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa57-cortexa53"
13PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa57-cortexa53" 13PACKAGE_EXTRA_ARCHS:tune-cortexa57-cortexa53 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa57-cortexa53"
14BASE_LIB_tune-cortexa57-cortexa53 = "lib64" 14BASE_LIB:tune-cortexa57-cortexa53 = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa57.inc b/meta/conf/machine/include/tune-cortexa57.inc
index 91fa6685f5..37650d8798 100644
--- a/meta/conf/machine/include/tune-cortexa57.inc
+++ b/meta/conf/machine/include/tune-cortexa57.inc
@@ -7,11 +7,11 @@ require conf/machine/include/arm/arch-armv8a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa57 cortexa57-crypto" 9AVAILTUNES += "cortexa57 cortexa57-crypto"
10ARMPKGARCH_tune-cortexa57 = "cortexa57" 10ARMPKGARCH:tune-cortexa57 = "cortexa57"
11ARMPKGARCH_tune-cortexa57-crypto = "cortexa57-crypto" 11ARMPKGARCH:tune-cortexa57-crypto = "cortexa57-crypto"
12TUNE_FEATURES_tune-cortexa57 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa57" 12TUNE_FEATURES:tune-cortexa57 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa57"
13TUNE_FEATURES_tune-cortexa57-crypto = "${TUNE_FEATURES_tune-cortexa57} crypto" 13TUNE_FEATURES:tune-cortexa57-crypto = "${TUNE_FEATURES:tune-cortexa57} crypto"
14PACKAGE_EXTRA_ARCHS_tune-cortexa57 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa57" 14PACKAGE_EXTRA_ARCHS:tune-cortexa57 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa57"
15PACKAGE_EXTRA_ARCHS_tune-cortexa57-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa57 cortexa57-crypto" 15PACKAGE_EXTRA_ARCHS:tune-cortexa57-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa57 cortexa57-crypto"
16BASE_LIB_tune-cortexa57 = "lib64" 16BASE_LIB:tune-cortexa57 = "lib64"
17BASE_LIB_tune-cortexa57-crypto = "lib64" 17BASE_LIB:tune-cortexa57-crypto = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa7.inc b/meta/conf/machine/include/tune-cortexa7.inc
index 05081dcbd8..5384369b59 100644
--- a/meta/conf/machine/include/tune-cortexa7.inc
+++ b/meta/conf/machine/include/tune-cortexa7.inc
@@ -8,44 +8,44 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa7', 'armv7ve:
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa7 cortexa7t cortexa7-neon cortexa7t-neon cortexa7-neon-vfpv4 cortexa7t-neon-vfpv4" 10AVAILTUNES += "cortexa7 cortexa7t cortexa7-neon cortexa7t-neon cortexa7-neon-vfpv4 cortexa7t-neon-vfpv4"
11ARMPKGARCH_tune-cortexa7 = "cortexa7" 11ARMPKGARCH:tune-cortexa7 = "cortexa7"
12ARMPKGARCH_tune-cortexa7t = "cortexa7" 12ARMPKGARCH:tune-cortexa7t = "cortexa7"
13ARMPKGARCH_tune-cortexa7-neon = "cortexa7" 13ARMPKGARCH:tune-cortexa7-neon = "cortexa7"
14ARMPKGARCH_tune-cortexa7t-neon = "cortexa7" 14ARMPKGARCH:tune-cortexa7t-neon = "cortexa7"
15ARMPKGARCH_tune-cortexa7-neon-vfpv4 = "cortexa7" 15ARMPKGARCH:tune-cortexa7-neon-vfpv4 = "cortexa7"
16ARMPKGARCH_tune-cortexa7t-neon-vfpv4 = "cortexa7" 16ARMPKGARCH:tune-cortexa7t-neon-vfpv4 = "cortexa7"
17# mcpu is used so don't use armv7ve as we don't want march 17# mcpu is used so don't use armv7ve as we don't want march
18TUNE_FEATURES_tune-cortexa7 = "arm vfp cortexa7" 18TUNE_FEATURES:tune-cortexa7 = "arm vfp cortexa7"
19TUNE_FEATURES_tune-cortexa7t = "${TUNE_FEATURES_tune-cortexa7} thumb" 19TUNE_FEATURES:tune-cortexa7t = "${TUNE_FEATURES:tune-cortexa7} thumb"
20TUNE_FEATURES_tune-cortexa7-neon = "${TUNE_FEATURES_tune-cortexa7} neon" 20TUNE_FEATURES:tune-cortexa7-neon = "${TUNE_FEATURES:tune-cortexa7} neon"
21TUNE_FEATURES_tune-cortexa7t-neon = "${TUNE_FEATURES_tune-cortexa7-neon} thumb" 21TUNE_FEATURES:tune-cortexa7t-neon = "${TUNE_FEATURES:tune-cortexa7-neon} thumb"
22TUNE_FEATURES_tune-cortexa7-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa7-neon} vfpv4" 22TUNE_FEATURES:tune-cortexa7-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa7-neon} vfpv4"
23TUNE_FEATURES_tune-cortexa7t-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa7-neon-vfpv4} thumb" 23TUNE_FEATURES:tune-cortexa7t-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa7-neon-vfpv4} thumb"
24PACKAGE_EXTRA_ARCHS_tune-cortexa7 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa7-vfp" 24PACKAGE_EXTRA_ARCHS:tune-cortexa7 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve} cortexa7-vfp"
25PACKAGE_EXTRA_ARCHS_tune-cortexa7t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa7-vfp cortexa7t2-vfp" 25PACKAGE_EXTRA_ARCHS:tune-cortexa7t = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet} cortexa7-vfp cortexa7t2-vfp"
26PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa7-vfp cortexa7-neon" 26PACKAGE_EXTRA_ARCHS:tune-cortexa7-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon} cortexa7-vfp cortexa7-neon"
27PACKAGE_EXTRA_ARCHS_tune-cortexa7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa7-vfp cortexa7-neon cortexa7t2-vfp cortexa7t2-neon" 27PACKAGE_EXTRA_ARCHS:tune-cortexa7t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon} cortexa7-vfp cortexa7-neon cortexa7t2-vfp cortexa7t2-neon"
28PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4" 28PACKAGE_EXTRA_ARCHS:tune-cortexa7-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ve-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4"
29PACKAGE_EXTRA_ARCHS_tune-cortexa7t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4 cortexa7t2-vfp cortexa7t2-neon cortexa7t2-neon-vfpv4" 29PACKAGE_EXTRA_ARCHS:tune-cortexa7t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vet-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4 cortexa7t2-vfp cortexa7t2-neon cortexa7t2-neon-vfpv4"
30 30
31# HF Tunes 31# HF Tunes
32AVAILTUNES += "cortexa7hf cortexa7thf cortexa7hf-neon cortexa7thf-neon cortexa7hf-neon-vfpv4 cortexa7thf-neon-vfpv4" 32AVAILTUNES += "cortexa7hf cortexa7thf cortexa7hf-neon cortexa7thf-neon cortexa7hf-neon-vfpv4 cortexa7thf-neon-vfpv4"
33ARMPKGARCH_tune-cortexa7hf = "cortexa7" 33ARMPKGARCH:tune-cortexa7hf = "cortexa7"
34ARMPKGARCH_tune-cortexa7thf = "cortexa7" 34ARMPKGARCH:tune-cortexa7thf = "cortexa7"
35ARMPKGARCH_tune-cortexa7hf-neon = "cortexa7" 35ARMPKGARCH:tune-cortexa7hf-neon = "cortexa7"
36ARMPKGARCH_tune-cortexa7thf-neon = "cortexa7" 36ARMPKGARCH:tune-cortexa7thf-neon = "cortexa7"
37ARMPKGARCH_tune-cortexa7hf-neon-vfpv4 = "cortexa7" 37ARMPKGARCH:tune-cortexa7hf-neon-vfpv4 = "cortexa7"
38ARMPKGARCH_tune-cortexa7thf-neon-vfpv4 = "cortexa7" 38ARMPKGARCH:tune-cortexa7thf-neon-vfpv4 = "cortexa7"
39# mcpu is used so don't use armv7ve as we don't want march 39# mcpu is used so don't use armv7ve as we don't want march
40TUNE_FEATURES_tune-cortexa7hf = "${TUNE_FEATURES_tune-cortexa7} callconvention-hard" 40TUNE_FEATURES:tune-cortexa7hf = "${TUNE_FEATURES:tune-cortexa7} callconvention-hard"
41TUNE_FEATURES_tune-cortexa7thf = "${TUNE_FEATURES_tune-cortexa7t} callconvention-hard" 41TUNE_FEATURES:tune-cortexa7thf = "${TUNE_FEATURES:tune-cortexa7t} callconvention-hard"
42TUNE_FEATURES_tune-cortexa7hf-neon = "${TUNE_FEATURES_tune-cortexa7-neon} callconvention-hard" 42TUNE_FEATURES:tune-cortexa7hf-neon = "${TUNE_FEATURES:tune-cortexa7-neon} callconvention-hard"
43TUNE_FEATURES_tune-cortexa7thf-neon = "${TUNE_FEATURES_tune-cortexa7t-neon} callconvention-hard" 43TUNE_FEATURES:tune-cortexa7thf-neon = "${TUNE_FEATURES:tune-cortexa7t-neon} callconvention-hard"
44TUNE_FEATURES_tune-cortexa7hf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa7-neon-vfpv4} callconvention-hard" 44TUNE_FEATURES:tune-cortexa7hf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa7-neon-vfpv4} callconvention-hard"
45TUNE_FEATURES_tune-cortexa7thf-neon-vfpv4 = "${TUNE_FEATURES_tune-cortexa7t-neon-vfpv4} callconvention-hard" 45TUNE_FEATURES:tune-cortexa7thf-neon-vfpv4 = "${TUNE_FEATURES:tune-cortexa7t-neon-vfpv4} callconvention-hard"
46PACKAGE_EXTRA_ARCHS_tune-cortexa7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa7hf-vfp" 46PACKAGE_EXTRA_ARCHS:tune-cortexa7hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf} cortexa7hf-vfp"
47PACKAGE_EXTRA_ARCHS_tune-cortexa7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa7hf-vfp cortexa7t2hf-vfp" 47PACKAGE_EXTRA_ARCHS:tune-cortexa7thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf} cortexa7hf-vfp cortexa7t2hf-vfp"
48PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa7hf-vfp cortexa7hf-neon" 48PACKAGE_EXTRA_ARCHS:tune-cortexa7hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon} cortexa7hf-vfp cortexa7hf-neon"
49PACKAGE_EXTRA_ARCHS_tune-cortexa7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa7hf-vfp cortexa7hf-neon cortexa7t2hf-vfp cortexa7t2hf-neon" 49PACKAGE_EXTRA_ARCHS:tune-cortexa7thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon} cortexa7hf-vfp cortexa7hf-neon cortexa7t2hf-vfp cortexa7t2hf-neon"
50PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4" 50PACKAGE_EXTRA_ARCHS:tune-cortexa7hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vehf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4"
51PACKAGE_EXTRA_ARCHS_tune-cortexa7thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cortexa7t2hf-neon-vfpv4" 51PACKAGE_EXTRA_ARCHS:tune-cortexa7thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7vethf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cortexa7t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc
index 98e8ebacff..a77ef59d62 100644
--- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc
+++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc
@@ -8,12 +8,12 @@ require conf/machine/include/arm/arch-armv8a.inc
8 8
9# cortexa72.cortexa53 implies crc support 9# cortexa72.cortexa53 implies crc support
10AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" 10AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto"
11ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" 11ARMPKGARCH:tune-cortexa72-cortexa53 = "cortexa72-cortexa53"
12ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53-crypto" 12ARMPKGARCH:tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53-crypto"
13TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" 13TUNE_FEATURES:tune-cortexa72-cortexa53 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa72-cortexa53"
14TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-cortexa72-cortexa53} crypto" 14TUNE_FEATURES:tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES:tune-cortexa72-cortexa53} crypto"
15PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" 15PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa72-cortexa53"
16PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" 16PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto"
17BASE_LIB_tune-cortexa72-cortexa53 = "lib64" 17BASE_LIB:tune-cortexa72-cortexa53 = "lib64"
18BASE_LIB_tune-cortexa72-cortexa53-crypto = "lib64" 18BASE_LIB:tune-cortexa72-cortexa53-crypto = "lib64"
19 19
diff --git a/meta/conf/machine/include/tune-cortexa72.inc b/meta/conf/machine/include/tune-cortexa72.inc
index b3f68ab6e3..2a510bd45b 100644
--- a/meta/conf/machine/include/tune-cortexa72.inc
+++ b/meta/conf/machine/include/tune-cortexa72.inc
@@ -7,7 +7,7 @@ require conf/machine/include/arm/arch-armv8a.inc
7 7
8# Little Endian base configs 8# Little Endian base configs
9AVAILTUNES += "cortexa72" 9AVAILTUNES += "cortexa72"
10ARMPKGARCH_tune-cortexa72 = "cortexa72" 10ARMPKGARCH:tune-cortexa72 = "cortexa72"
11TUNE_FEATURES_tune-cortexa72 = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72" 11TUNE_FEATURES:tune-cortexa72 = "${TUNE_FEATURES:tune-armv8a-crc-crypto} cortexa72"
12PACKAGE_EXTRA_ARCHS_tune-cortexa72 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72" 12PACKAGE_EXTRA_ARCHS:tune-cortexa72 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa72"
13BASE_LIB_tune-cortexa72 = "lib64" 13BASE_LIB:tune-cortexa72 = "lib64"
diff --git a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc b/meta/conf/machine/include/tune-cortexa73-cortexa53.inc
index 3750f0762d..9cebffd54d 100644
--- a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc
+++ b/meta/conf/machine/include/tune-cortexa73-cortexa53.inc
@@ -8,12 +8,12 @@ require conf/machine/include/arm/arch-armv8a.inc
8 8
9# cortexa73.cortexa53 implies crc support 9# cortexa73.cortexa53 implies crc support
10AVAILTUNES += "cortexa73-cortexa53 cortexa73-cortexa53-crypto" 10AVAILTUNES += "cortexa73-cortexa53 cortexa73-cortexa53-crypto"
11ARMPKGARCH_tune-cortexa73-cortexa53 = "cortexa73-cortexa53" 11ARMPKGARCH:tune-cortexa73-cortexa53 = "cortexa73-cortexa53"
12ARMPKGARCH_tune-cortexa73-cortexa53-crypto = "cortexa73-cortexa53-crypto" 12ARMPKGARCH:tune-cortexa73-cortexa53-crypto = "cortexa73-cortexa53-crypto"
13TUNE_FEATURES_tune-cortexa73-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa73-cortexa53" 13TUNE_FEATURES:tune-cortexa73-cortexa53 = "${TUNE_FEATURES:tune-armv8a-crc} cortexa73-cortexa53"
14TUNE_FEATURES_tune-cortexa73-cortexa53-crypto = "${TUNE_FEATURES_tune-cortexa73-cortexa53} crypto" 14TUNE_FEATURES:tune-cortexa73-cortexa53-crypto = "${TUNE_FEATURES:tune-cortexa73-cortexa53} crypto"
15PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa73-cortexa53" 15PACKAGE_EXTRA_ARCHS:tune-cortexa73-cortexa53 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa73-cortexa53"
16PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa73-cortexa53 cortexa73-cortexa53-crypto" 16PACKAGE_EXTRA_ARCHS:tune-cortexa73-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa73-cortexa53 cortexa73-cortexa53-crypto"
17BASE_LIB_tune-cortexa73-cortexa53 = "lib64" 17BASE_LIB:tune-cortexa73-cortexa53 = "lib64"
18BASE_LIB_tune-cortexa73-cortexa53-crypto = "lib64" 18BASE_LIB:tune-cortexa73-cortexa53-crypto = "lib64"
19 19
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index f27bfb8d67..e27002a29a 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -8,32 +8,32 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa8', 'armv7a:'
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon cortexa8t-neon" 10AVAILTUNES += "cortexa8 cortexa8t cortexa8-neon cortexa8t-neon"
11ARMPKGARCH_tune-cortexa8 = "cortexa8" 11ARMPKGARCH:tune-cortexa8 = "cortexa8"
12ARMPKGARCH_tune-cortexa8t = "cortexa8" 12ARMPKGARCH:tune-cortexa8t = "cortexa8"
13ARMPKGARCH_tune-cortexa8-neon = "cortexa8" 13ARMPKGARCH:tune-cortexa8-neon = "cortexa8"
14ARMPKGARCH_tune-cortexa8t-neon = "cortexa8" 14ARMPKGARCH:tune-cortexa8t-neon = "cortexa8"
15# mcpu is used so don't use armv7a as we don't want march 15# mcpu is used so don't use armv7a as we don't want march
16TUNE_FEATURES_tune-cortexa8 = "arm vfp cortexa8" 16TUNE_FEATURES:tune-cortexa8 = "arm vfp cortexa8"
17TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-cortexa8} thumb" 17TUNE_FEATURES:tune-cortexa8t = "${TUNE_FEATURES:tune-cortexa8} thumb"
18TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-cortexa8} neon" 18TUNE_FEATURES:tune-cortexa8-neon = "${TUNE_FEATURES:tune-cortexa8} neon"
19TUNE_FEATURES_tune-cortexa8t-neon = "${TUNE_FEATURES_tune-cortexa8-neon} thumb" 19TUNE_FEATURES:tune-cortexa8t-neon = "${TUNE_FEATURES:tune-cortexa8-neon} thumb"
20PACKAGE_EXTRA_ARCHS_tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa8-vfp" 20PACKAGE_EXTRA_ARCHS:tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} cortexa8-vfp"
21PACKAGE_EXTRA_ARCHS_tune-cortexa8t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa8-vfp cortexa8t2-vfp" 21PACKAGE_EXTRA_ARCHS:tune-cortexa8t = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} cortexa8-vfp cortexa8t2-vfp"
22PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa8-vfp cortexa8-neon" 22PACKAGE_EXTRA_ARCHS:tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-neon} cortexa8-vfp cortexa8-neon"
23PACKAGE_EXTRA_ARCHS_tune-cortexa8t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa8-vfp cortexa8-neon cortexa8t2-vfp cortexa8t2-neon" 23PACKAGE_EXTRA_ARCHS:tune-cortexa8t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-neon} cortexa8-vfp cortexa8-neon cortexa8t2-vfp cortexa8t2-neon"
24 24
25# HF Tunes 25# HF Tunes
26AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon cortexa8thf-neon" 26AVAILTUNES += "cortexa8hf cortexa8thf cortexa8hf-neon cortexa8thf-neon"
27ARMPKGARCH_tune-cortexa8hf = "cortexa8" 27ARMPKGARCH:tune-cortexa8hf = "cortexa8"
28ARMPKGARCH_tune-cortexa8thf = "cortexa8" 28ARMPKGARCH:tune-cortexa8thf = "cortexa8"
29ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8" 29ARMPKGARCH:tune-cortexa8hf-neon = "cortexa8"
30ARMPKGARCH_tune-cortexa8thf-neon = "cortexa8" 30ARMPKGARCH:tune-cortexa8thf-neon = "cortexa8"
31# mcpu is used so don't use armv7a as we don't want march 31# mcpu is used so don't use armv7a as we don't want march
32TUNE_FEATURES_tune-cortexa8hf = "${TUNE_FEATURES_tune-cortexa8} callconvention-hard" 32TUNE_FEATURES:tune-cortexa8hf = "${TUNE_FEATURES:tune-cortexa8} callconvention-hard"
33TUNE_FEATURES_tune-cortexa8thf = "${TUNE_FEATURES_tune-cortexa8t} callconvention-hard" 33TUNE_FEATURES:tune-cortexa8thf = "${TUNE_FEATURES:tune-cortexa8t} callconvention-hard"
34TUNE_FEATURES_tune-cortexa8hf-neon = "${TUNE_FEATURES_tune-cortexa8-neon} callconvention-hard" 34TUNE_FEATURES:tune-cortexa8hf-neon = "${TUNE_FEATURES:tune-cortexa8-neon} callconvention-hard"
35TUNE_FEATURES_tune-cortexa8thf-neon = "${TUNE_FEATURES_tune-cortexa8t-neon} callconvention-hard" 35TUNE_FEATURES:tune-cortexa8thf-neon = "${TUNE_FEATURES:tune-cortexa8t-neon} callconvention-hard"
36PACKAGE_EXTRA_ARCHS_tune-cortexa8hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa8hf-vfp" 36PACKAGE_EXTRA_ARCHS:tune-cortexa8hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} cortexa8hf-vfp"
37PACKAGE_EXTRA_ARCHS_tune-cortexa8thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa8hf-vfp cortexa8t2hf-vfp" 37PACKAGE_EXTRA_ARCHS:tune-cortexa8thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} cortexa8hf-vfp cortexa8t2hf-vfp"
38PACKAGE_EXTRA_ARCHS_tune-cortexa8hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa8hf-vfp cortexa8hf-neon" 38PACKAGE_EXTRA_ARCHS:tune-cortexa8hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon} cortexa8hf-vfp cortexa8hf-neon"
39PACKAGE_EXTRA_ARCHS_tune-cortexa8thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa8hf-vfp cortexa8hf-neon cortexa8t2hf-vfp cortexa8t2hf-neon" 39PACKAGE_EXTRA_ARCHS:tune-cortexa8thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon} cortexa8hf-vfp cortexa8hf-neon cortexa8t2hf-vfp cortexa8t2hf-neon"
diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc
index 0eb8f3b9d3..d046a11a51 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/meta/conf/machine/include/tune-cortexa9.inc
@@ -8,48 +8,48 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa9', 'armv7a:'
8 8
9# Little Endian base configs 9# Little Endian base configs
10AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon cortexa9t-neon" 10AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon cortexa9t-neon"
11ARMPKGARCH_tune-cortexa9 = "cortexa9" 11ARMPKGARCH:tune-cortexa9 = "cortexa9"
12ARMPKGARCH_tune-cortexa9t = "cortexa9" 12ARMPKGARCH:tune-cortexa9t = "cortexa9"
13ARMPKGARCH_tune-cortexa9-neon = "cortexa9" 13ARMPKGARCH:tune-cortexa9-neon = "cortexa9"
14ARMPKGARCH_tune-cortexa9t-neon = "cortexa9" 14ARMPKGARCH:tune-cortexa9t-neon = "cortexa9"
15# mcpu is used so don't use armv7a as we don't want march 15# mcpu is used so don't use armv7a as we don't want march
16TUNE_FEATURES_tune-cortexa9 = "arm vfp cortexa9" 16TUNE_FEATURES:tune-cortexa9 = "arm vfp cortexa9"
17TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-cortexa9} thumb" 17TUNE_FEATURES:tune-cortexa9t = "${TUNE_FEATURES:tune-cortexa9} thumb"
18TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-cortexa9} neon" 18TUNE_FEATURES:tune-cortexa9-neon = "${TUNE_FEATURES:tune-cortexa9} neon"
19TUNE_FEATURES_tune-cortexa9t-neon = "${TUNE_FEATURES_tune-cortexa9-neon} thumb" 19TUNE_FEATURES:tune-cortexa9t-neon = "${TUNE_FEATURES:tune-cortexa9-neon} thumb"
20PACKAGE_EXTRA_ARCHS_tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa9-vfp" 20PACKAGE_EXTRA_ARCHS:tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a} cortexa9-vfp"
21PACKAGE_EXTRA_ARCHS_tune-cortexa9t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa9-vfp cortexa9t2-vfp" 21PACKAGE_EXTRA_ARCHS:tune-cortexa9t = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} cortexa9-vfp cortexa9t2-vfp"
22PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa9-vfp cortexa9-neon" 22PACKAGE_EXTRA_ARCHS:tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-neon} cortexa9-vfp cortexa9-neon"
23PACKAGE_EXTRA_ARCHS_tune-cortexa9t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa9-vfp cortexa9-neon cortexa9t2-vfp cortexa9t2-neon" 23PACKAGE_EXTRA_ARCHS:tune-cortexa9t-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-neon} cortexa9-vfp cortexa9-neon cortexa9t2-vfp cortexa9t2-neon"
24 24
25# HF Tunes 25# HF Tunes
26AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon cortexa9thf-neon" 26AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon cortexa9thf-neon"
27ARMPKGARCH_tune-cortexa9hf = "cortexa9" 27ARMPKGARCH:tune-cortexa9hf = "cortexa9"
28ARMPKGARCH_tune-cortexa9thf = "cortexa9" 28ARMPKGARCH:tune-cortexa9thf = "cortexa9"
29ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9" 29ARMPKGARCH:tune-cortexa9hf-neon = "cortexa9"
30ARMPKGARCH_tune-cortexa9thf-neon = "cortexa9" 30ARMPKGARCH:tune-cortexa9thf-neon = "cortexa9"
31# mcpu is used so don't use armv7a as we don't want march 31# mcpu is used so don't use armv7a as we don't want march
32TUNE_FEATURES_tune-cortexa9hf = "${TUNE_FEATURES_tune-cortexa9} callconvention-hard" 32TUNE_FEATURES:tune-cortexa9hf = "${TUNE_FEATURES:tune-cortexa9} callconvention-hard"
33TUNE_FEATURES_tune-cortexa9thf = "${TUNE_FEATURES_tune-cortexa9t} callconvention-hard" 33TUNE_FEATURES:tune-cortexa9thf = "${TUNE_FEATURES:tune-cortexa9t} callconvention-hard"
34TUNE_FEATURES_tune-cortexa9hf-neon = "${TUNE_FEATURES_tune-cortexa9-neon} callconvention-hard" 34TUNE_FEATURES:tune-cortexa9hf-neon = "${TUNE_FEATURES:tune-cortexa9-neon} callconvention-hard"
35TUNE_FEATURES_tune-cortexa9thf-neon = "${TUNE_FEATURES_tune-cortexa9t-neon} callconvention-hard" 35TUNE_FEATURES:tune-cortexa9thf-neon = "${TUNE_FEATURES:tune-cortexa9t-neon} callconvention-hard"
36PACKAGE_EXTRA_ARCHS_tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa9hf-vfp" 36PACKAGE_EXTRA_ARCHS:tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf} cortexa9hf-vfp"
37PACKAGE_EXTRA_ARCHS_tune-cortexa9thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa9hf-vfp cortexa9t2hf-vfp" 37PACKAGE_EXTRA_ARCHS:tune-cortexa9thf = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf} cortexa9hf-vfp cortexa9t2hf-vfp"
38PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa9hf-vfp cortexa9hf-neon" 38PACKAGE_EXTRA_ARCHS:tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-neon} cortexa9hf-vfp cortexa9hf-neon"
39PACKAGE_EXTRA_ARCHS_tune-cortexa9thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa9hf-vfp cortexa9hf-neon cortexa9t2hf-vfp cortexa9t2hf-neon" 39PACKAGE_EXTRA_ARCHS:tune-cortexa9thf-neon = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-neon} cortexa9hf-vfp cortexa9hf-neon cortexa9t2hf-vfp cortexa9t2hf-neon"
40 40
41# VFPv3 Tunes 41# VFPv3 Tunes
42AVAILTUNES += "cortexa9-vfpv3 cortexa9t-vfpv3 cortexa9hf-vfpv3 cortexa9thf-vfpv3" 42AVAILTUNES += "cortexa9-vfpv3 cortexa9t-vfpv3 cortexa9hf-vfpv3 cortexa9thf-vfpv3"
43ARMPKGARCH_tune-cortexa9-vfpv3 = "cortexa9" 43ARMPKGARCH:tune-cortexa9-vfpv3 = "cortexa9"
44ARMPKGARCH_tune-cortexa9t-vfpv3 = "cortexa9" 44ARMPKGARCH:tune-cortexa9t-vfpv3 = "cortexa9"
45ARMPKGARCH_tune-cortexa9hf-vfpv3 = "cortexa9" 45ARMPKGARCH:tune-cortexa9hf-vfpv3 = "cortexa9"
46ARMPKGARCH_tune-cortexa9thf-vfpv3 = "cortexa9" 46ARMPKGARCH:tune-cortexa9thf-vfpv3 = "cortexa9"
47# mcpu is used so don't use armv7a as we don't want march 47# mcpu is used so don't use armv7a as we don't want march
48TUNE_FEATURES_tune-cortexa9-vfpv3 = "${TUNE_FEATURES_tune-cortexa9} vfpv3" 48TUNE_FEATURES:tune-cortexa9-vfpv3 = "${TUNE_FEATURES:tune-cortexa9} vfpv3"
49TUNE_FEATURES_tune-cortexa9t-vfpv3 = "${TUNE_FEATURES_tune-cortexa9t} vfpv3" 49TUNE_FEATURES:tune-cortexa9t-vfpv3 = "${TUNE_FEATURES:tune-cortexa9t} vfpv3"
50TUNE_FEATURES_tune-cortexa9hf-vfpv3 = "${TUNE_FEATURES_tune-cortexa9hf} vfpv3" 50TUNE_FEATURES:tune-cortexa9hf-vfpv3 = "${TUNE_FEATURES:tune-cortexa9hf} vfpv3"
51TUNE_FEATURES_tune-cortexa9thf-vfpv3 = "${TUNE_FEATURES_tune-cortexa9thf} vfpv3" 51TUNE_FEATURES:tune-cortexa9thf-vfpv3 = "${TUNE_FEATURES:tune-cortexa9thf} vfpv3"
52PACKAGE_EXTRA_ARCHS_tune-cortexa9-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3} cortexa9-vfp cortexa9-vfpv3" 52PACKAGE_EXTRA_ARCHS:tune-cortexa9-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7a-vfpv3} cortexa9-vfp cortexa9-vfpv3"
53PACKAGE_EXTRA_ARCHS_tune-cortexa9t-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3} cortexa9-vfp cortexa9-vfpv3 cortexa9t2-vfp cortexa9t2-vfpv3" 53PACKAGE_EXTRA_ARCHS:tune-cortexa9t-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at-vfpv3} cortexa9-vfp cortexa9-vfpv3 cortexa9t2-vfp cortexa9t2-vfpv3"
54PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3" 54PACKAGE_EXTRA_ARCHS:tune-cortexa9hf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7ahf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3"
55PACKAGE_EXTRA_ARCHS_tune-cortexa9thf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3 cortexa9t2hf-vfp cortexa9t2hf-vfpv3" 55PACKAGE_EXTRA_ARCHS:tune-cortexa9thf-vfpv3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7athf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3 cortexa9t2hf-vfp cortexa9t2hf-vfpv3"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 5e1a0e5791..0d481d3888 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -7,6 +7,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', ' -march=ep9312
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '', d)}"
8 8
9AVAILTUNES += "ep9312" 9AVAILTUNES += "ep9312"
10ARMPKGARCH_tune-ep9312 = "ep9312" 10ARMPKGARCH:tune-ep9312 = "ep9312"
11TUNE_FEATURES_tune-ep9312 = "thumb ep9312" 11TUNE_FEATURES:tune-ep9312 = "thumb ep9312"
12PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312t" 12PACKAGE_EXTRA_ARCHS:tune-ep9312 = "${PACKAGE_EXTRA_ARCHS:tune-armv4t} ep9312t"
diff --git a/meta/conf/machine/include/tune-i586-nlp.inc b/meta/conf/machine/include/tune-i586-nlp.inc
index 88e59038fa..ecfbf9f1b2 100644
--- a/meta/conf/machine/include/tune-i586-nlp.inc
+++ b/meta/conf/machine/include/tune-i586-nlp.inc
@@ -13,7 +13,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'i586-nlp', ' -march=i586
13 13
14# Quark tune feature 14# Quark tune feature
15AVAILTUNES = "i586-nlp-32" 15AVAILTUNES = "i586-nlp-32"
16TUNE_FEATURES_tune-i586-nlp-32 = "${TUNE_FEATURES_tune-x86} i586-nlp" 16TUNE_FEATURES:tune-i586-nlp-32 = "${TUNE_FEATURES:tune-x86} i586-nlp"
17BASE_LIB_tune-i586-nlp-32 = "lib" 17BASE_LIB:tune-i586-nlp-32 = "lib"
18TUNE_PKGARCH_tune-i586-nlp-32 = "i586-nlp-32" 18TUNE_PKGARCH:tune-i586-nlp-32 = "i586-nlp-32"
19PACKAGE_EXTRA_ARCHS_tune-i586-nlp-32 = "i586-nlp-32" 19PACKAGE_EXTRA_ARCHS:tune-i586-nlp-32 = "i586-nlp-32"
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
index 1ab17bd402..b1299e9e91 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -8,7 +8,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'i586', ' -march=i586', ''
8 8
9# Extra tune selections 9# Extra tune selections
10AVAILTUNES += "i586" 10AVAILTUNES += "i586"
11TUNE_FEATURES_tune-i586 = "${TUNE_FEATURES_tune-x86} i586" 11TUNE_FEATURES:tune-i586 = "${TUNE_FEATURES:tune-x86} i586"
12BASE_LIB_tune-i586 = "lib" 12BASE_LIB:tune-i586 = "lib"
13TUNE_PKGARCH_tune-i586 = "i586" 13TUNE_PKGARCH:tune-i586 = "i586"
14PACKAGE_EXTRA_ARCHS_tune-i586 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i586" 14PACKAGE_EXTRA_ARCHS:tune-i586 = "${PACKAGE_EXTRA_ARCHS:tune-x86} i586"
diff --git a/meta/conf/machine/include/tune-i686.inc b/meta/conf/machine/include/tune-i686.inc
index bdb4799209..3feb4df8ba 100644
--- a/meta/conf/machine/include/tune-i686.inc
+++ b/meta/conf/machine/include/tune-i686.inc
@@ -21,7 +21,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'i686', ' -march=i686', ''
21 21
22# Extra tune selections 22# Extra tune selections
23AVAILTUNES += "i686" 23AVAILTUNES += "i686"
24TUNE_FEATURES_tune-i686 = "${TUNE_FEATURES_tune-x86} i686" 24TUNE_FEATURES:tune-i686 = "${TUNE_FEATURES:tune-x86} i686"
25BASE_LIB_tune-i686 = "lib" 25BASE_LIB:tune-i686 = "lib"
26TUNE_PKGARCH_tune-i686 = "i686" 26TUNE_PKGARCH:tune-i686 = "i686"
27PACKAGE_EXTRA_ARCHS_tune-i686 = "${PACKAGE_EXTRA_ARCHS_tune-i586} i686" 27PACKAGE_EXTRA_ARCHS:tune-i686 = "${PACKAGE_EXTRA_ARCHS:tune-i586} i686"
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 81ff4c9ae2..c584b47d18 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -10,6 +10,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'iwmmxt', ' -mcpu=iwmmxt',
10MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'iwmmxt', 'armv5:', '', d)}" 10MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'iwmmxt', 'armv5:', '', d)}"
11 11
12AVAILTUNES += "iwmmxt" 12AVAILTUNES += "iwmmxt"
13ARMPKGARCH_tune-iwmmxt = "iwmmxt" 13ARMPKGARCH:tune-iwmmxt = "iwmmxt"
14TUNE_FEATURES_tune-iwmmxt = "thumb iwmmxt" 14TUNE_FEATURES:tune-iwmmxt = "thumb iwmmxt"
15PACKAGE_EXTRA_ARCHS_tune-iwmmxt = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} iwmmxt iwmmxtt" 15PACKAGE_EXTRA_ARCHS:tune-iwmmxt = "${PACKAGE_EXTRA_ARCHS:tune-armv5te} iwmmxt iwmmxtt"
diff --git a/meta/conf/machine/include/tune-mcf5441x.inc b/meta/conf/machine/include/tune-mcf5441x.inc
index 11a41a7c5d..7eefce03cb 100644
--- a/meta/conf/machine/include/tune-mcf5441x.inc
+++ b/meta/conf/machine/include/tune-mcf5441x.inc
@@ -6,8 +6,8 @@ TUNEVALID[mcf5441x] = "Enable coldfire specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mcf5441x', ' -mcpu=54418', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mcf5441x', ' -mcpu=54418', '', d)}"
7 7
8AVAILTUNES += "mcf5441x" 8AVAILTUNES += "mcf5441x"
9TUNE_FEATURES_tune-mcf5441x = "mcf5441x" 9TUNE_FEATURES:tune-mcf5441x = "mcf5441x"
10TUNE_ARCH_tune-mcf5441x = "mcf5441x" 10TUNE_ARCH:tune-mcf5441x = "mcf5441x"
11TUNE_PKGARCH_tune-mcf5441x = "mcf5441x" 11TUNE_PKGARCH:tune-mcf5441x = "mcf5441x"
12PACKAGE_EXTRA_ARCHS_tune-mcf5441x = "m68k mcf5441x" 12PACKAGE_EXTRA_ARCHS:tune-mcf5441x = "m68k mcf5441x"
13 13
diff --git a/meta/conf/machine/include/tune-microblaze.inc b/meta/conf/machine/include/tune-microblaze.inc
index 41f0afe668..11f7233cf4 100644
--- a/meta/conf/machine/include/tune-microblaze.inc
+++ b/meta/conf/machine/include/tune-microblaze.inc
@@ -3,6 +3,6 @@ DEFAULTTUNE ?= "microblaze"
3require conf/machine/include/microblaze/arch-microblaze.inc 3require conf/machine/include/microblaze/arch-microblaze.inc
4 4
5AVAILTUNES += "microblaze" 5AVAILTUNES += "microblaze"
6TUNE_FEATURES_tune-microblaze = "microblaze" 6TUNE_FEATURES:tune-microblaze = "microblaze"
7PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 7PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"
8 8
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index a90c0f059d..820087f59d 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -9,21 +9,21 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips32', ' -march=mips32'
9# Base Tunes (Hard Float) 9# Base Tunes (Hard Float)
10AVAILTUNES += "mips32 mips32el" 10AVAILTUNES += "mips32 mips32el"
11 11
12TUNE_FEATURES_tune-mips32 = "${TUNE_FEATURES_tune-mips} mips32" 12TUNE_FEATURES:tune-mips32 = "${TUNE_FEATURES:tune-mips} mips32"
13MIPSPKGSFX_VARIANT_tune-mips32 = "mips32" 13MIPSPKGSFX_VARIANT:tune-mips32 = "mips32"
14PACKAGE_EXTRA_ARCHS_tune-mips32 = "mips mips32" 14PACKAGE_EXTRA_ARCHS:tune-mips32 = "mips mips32"
15 15
16TUNE_FEATURES_tune-mips32el = "${TUNE_FEATURES_tune-mipsel} mips32" 16TUNE_FEATURES:tune-mips32el = "${TUNE_FEATURES:tune-mipsel} mips32"
17MIPSPKGSFX_VARIANT_tune-mips32el = "mips32el" 17MIPSPKGSFX_VARIANT:tune-mips32el = "mips32el"
18PACKAGE_EXTRA_ARCHS_tune-mips32el = "mipsel mips32el" 18PACKAGE_EXTRA_ARCHS:tune-mips32el = "mipsel mips32el"
19 19
20# Soft Float 20# Soft Float
21AVAILTUNES += "mips32-nf mips32el-nf" 21AVAILTUNES += "mips32-nf mips32el-nf"
22 22
23TUNE_FEATURES_tune-mips32-nf = "${TUNE_FEATURES_tune-mips-nf} mips32" 23TUNE_FEATURES:tune-mips32-nf = "${TUNE_FEATURES:tune-mips-nf} mips32"
24MIPSPKGSFX_VARIANT_tune-mips32-nf = "mips32" 24MIPSPKGSFX_VARIANT:tune-mips32-nf = "mips32"
25PACKAGE_EXTRA_ARCHS_tune-mips32-nf = "mips-nf mips32-nf" 25PACKAGE_EXTRA_ARCHS:tune-mips32-nf = "mips-nf mips32-nf"
26 26
27TUNE_FEATURES_tune-mips32el-nf = "${TUNE_FEATURES_tune-mipsel-nf} mips32" 27TUNE_FEATURES:tune-mips32el-nf = "${TUNE_FEATURES:tune-mipsel-nf} mips32"
28MIPSPKGSFX_VARIANT_tune-mips32el-nf = "mips32el" 28MIPSPKGSFX_VARIANT:tune-mips32el-nf = "mips32el"
29PACKAGE_EXTRA_ARCHS_tune-mips32el-nf = "mipsel-nf mips32el-nf" 29PACKAGE_EXTRA_ARCHS:tune-mips32el-nf = "mipsel-nf mips32el-nf"
diff --git a/meta/conf/machine/include/tune-mips32r2.inc b/meta/conf/machine/include/tune-mips32r2.inc
index 14473ca831..e7f6753d3d 100644
--- a/meta/conf/machine/include/tune-mips32r2.inc
+++ b/meta/conf/machine/include/tune-mips32r2.inc
@@ -9,21 +9,21 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', ' -march=mips3
9# Base Tunes (Hard Float) 9# Base Tunes (Hard Float)
10AVAILTUNES += "mips32r2 mips32r2el" 10AVAILTUNES += "mips32r2 mips32r2el"
11 11
12TUNE_FEATURES_tune-mips32r2 = "${TUNE_FEATURES_tune-mips} mips32r2" 12TUNE_FEATURES:tune-mips32r2 = "${TUNE_FEATURES:tune-mips} mips32r2"
13MIPSPKGSFX_VARIANT_tune-mips32r2 = "mips32r2" 13MIPSPKGSFX_VARIANT:tune-mips32r2 = "mips32r2"
14PACKAGE_EXTRA_ARCHS_tune-mips32r2 = "mips mips32 mips32r2" 14PACKAGE_EXTRA_ARCHS:tune-mips32r2 = "mips mips32 mips32r2"
15 15
16TUNE_FEATURES_tune-mips32r2el = "${TUNE_FEATURES_tune-mipsel} mips32r2" 16TUNE_FEATURES:tune-mips32r2el = "${TUNE_FEATURES:tune-mipsel} mips32r2"
17MIPSPKGSFX_VARIANT_tune-mips32r2el = "mips32r2el" 17MIPSPKGSFX_VARIANT:tune-mips32r2el = "mips32r2el"
18PACKAGE_EXTRA_ARCHS_tune-mips32r2el = "mipsel mips32el mips32r2el" 18PACKAGE_EXTRA_ARCHS:tune-mips32r2el = "mipsel mips32el mips32r2el"
19 19
20# Soft Float 20# Soft Float
21AVAILTUNES += "mips32r2-nf mips32r2el-nf" 21AVAILTUNES += "mips32r2-nf mips32r2el-nf"
22 22
23TUNE_FEATURES_tune-mips32r2-nf = "${TUNE_FEATURES_tune-mips-nf} mips32r2" 23TUNE_FEATURES:tune-mips32r2-nf = "${TUNE_FEATURES:tune-mips-nf} mips32r2"
24MIPSPKGSFX_VARIANT_tune-mips32r2-nf = "mips32r2" 24MIPSPKGSFX_VARIANT:tune-mips32r2-nf = "mips32r2"
25PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf = "mips-nf mips32-nf mips32r2-nf" 25PACKAGE_EXTRA_ARCHS:tune-mips32r2-nf = "mips-nf mips32-nf mips32r2-nf"
26 26
27TUNE_FEATURES_tune-mips32r2el-nf = "${TUNE_FEATURES_tune-mipsel-nf} mips32r2" 27TUNE_FEATURES:tune-mips32r2el-nf = "${TUNE_FEATURES:tune-mipsel-nf} mips32r2"
28MIPSPKGSFX_VARIANT_tune-mips32r2el-nf = "mips32r2el" 28MIPSPKGSFX_VARIANT:tune-mips32r2el-nf = "mips32r2el"
29PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf = "mipsel-nf mips32el-nf mips32r2el-nf" 29PACKAGE_EXTRA_ARCHS:tune-mips32r2el-nf = "mipsel-nf mips32el-nf mips32r2el-nf"
diff --git a/meta/conf/machine/include/tune-mips32r6.inc b/meta/conf/machine/include/tune-mips32r6.inc
index 44369cb59c..9904cc0b11 100644
--- a/meta/conf/machine/include/tune-mips32r6.inc
+++ b/meta/conf/machine/include/tune-mips32r6.inc
@@ -9,21 +9,21 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', ' -march=mi
9# Base Tunes (Hard Float) 9# Base Tunes (Hard Float)
10AVAILTUNES += "mipsisa32r6 mipsisa32r6el" 10AVAILTUNES += "mipsisa32r6 mipsisa32r6el"
11 11
12TUNE_FEATURES_tune-mipsisa32r6 = "o32 bigendian mipsisa32r6 fpu-hard r6" 12TUNE_FEATURES:tune-mipsisa32r6 = "o32 bigendian mipsisa32r6 fpu-hard r6"
13MIPSPKGSFX_VARIANT_tune-mipsisa32r6 = "${TUNE_ARCH}" 13MIPSPKGSFX_VARIANT:tune-mipsisa32r6 = "${TUNE_ARCH}"
14PACKAGE_EXTRA_ARCHS_tune-mipsisa32r6 = "mipsisa32r6" 14PACKAGE_EXTRA_ARCHS:tune-mipsisa32r6 = "mipsisa32r6"
15 15
16TUNE_FEATURES_tune-mipsisa32r6el = "o32 fpu-hard mipsisa32r6 r6" 16TUNE_FEATURES:tune-mipsisa32r6el = "o32 fpu-hard mipsisa32r6 r6"
17MIPSPKGSFX_VARIANT_tune-mipsisa32r6el = "${TUNE_ARCH}" 17MIPSPKGSFX_VARIANT:tune-mipsisa32r6el = "${TUNE_ARCH}"
18PACKAGE_EXTRA_ARCHS_tune-mipsisa32r6el = "mipsisa32r6el" 18PACKAGE_EXTRA_ARCHS:tune-mipsisa32r6el = "mipsisa32r6el"
19 19
20# Soft Float 20# Soft Float
21AVAILTUNES += "mipsisa32r6-nf mipsisa32r6el-nf" 21AVAILTUNES += "mipsisa32r6-nf mipsisa32r6el-nf"
22 22
23TUNE_FEATURES_tune-mipsisa32r6-nf = "o32 bigendian mipsisa32r6 r6" 23TUNE_FEATURES:tune-mipsisa32r6-nf = "o32 bigendian mipsisa32r6 r6"
24MIPSPKGSFX_VARIANT_tune-mipsisa32r6-nf = "${TUNE_ARCH}" 24MIPSPKGSFX_VARIANT:tune-mipsisa32r6-nf = "${TUNE_ARCH}"
25PACKAGE_EXTRA_ARCHS_tune-mipsisa32r6-nf = "mipsisa32r6-nf" 25PACKAGE_EXTRA_ARCHS:tune-mipsisa32r6-nf = "mipsisa32r6-nf"
26 26
27TUNE_FEATURES_tune-mipsisa32r6el-nf = "o32 mipsisa32r6 r6" 27TUNE_FEATURES:tune-mipsisa32r6el-nf = "o32 mipsisa32r6 r6"
28MIPSPKGSFX_VARIANT_tune-mipsisa32r6el-nf = "${TUNE_ARCH}" 28MIPSPKGSFX_VARIANT:tune-mipsisa32r6el-nf = "${TUNE_ARCH}"
29PACKAGE_EXTRA_ARCHS_tune-mipsisa32r6el-nf = "mipsisa32r6el-nf" 29PACKAGE_EXTRA_ARCHS:tune-mipsisa32r6el-nf = "mipsisa32r6el-nf"
diff --git a/meta/conf/machine/include/tune-mips64r2.inc b/meta/conf/machine/include/tune-mips64r2.inc
index 75d7535add..6337abb09f 100644
--- a/meta/conf/machine/include/tune-mips64r2.inc
+++ b/meta/conf/machine/include/tune-mips64r2.inc
@@ -8,77 +8,77 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips64r2', ' -march=mips6
8# Base tunes 8# Base tunes
9AVAILTUNES += "mips64r2 mips64r2el" 9AVAILTUNES += "mips64r2 mips64r2el"
10 10
11TUNE_FEATURES_tune-mips64r2 = "${TUNE_FEATURES_tune-mips64} mips64r2" 11TUNE_FEATURES:tune-mips64r2 = "${TUNE_FEATURES:tune-mips64} mips64r2"
12BASE_LIB_tune-mips64r2 = "lib64" 12BASE_LIB:tune-mips64r2 = "lib64"
13MIPSPKGSFX_VARIANT_tune-mips64r2 = "mips64r2" 13MIPSPKGSFX_VARIANT:tune-mips64r2 = "mips64r2"
14PACKAGE_EXTRA_ARCHS_tune-mips64r2 = "mips64 mips64r2" 14PACKAGE_EXTRA_ARCHS:tune-mips64r2 = "mips64 mips64r2"
15 15
16TUNE_FEATURES_tune-mips64r2el = "${TUNE_FEATURES_tune-mips64el} mips64r2" 16TUNE_FEATURES:tune-mips64r2el = "${TUNE_FEATURES:tune-mips64el} mips64r2"
17BASE_LIB_tune-mips64r2el = "lib64" 17BASE_LIB:tune-mips64r2el = "lib64"
18MIPSPKGSFX_VARIANT_tune-mips64r2el = "mips64r2el" 18MIPSPKGSFX_VARIANT:tune-mips64r2el = "mips64r2el"
19PACKAGE_EXTRA_ARCHS_tune-mips64r2el = "mips64el mips64r2el" 19PACKAGE_EXTRA_ARCHS:tune-mips64r2el = "mips64el mips64r2el"
20 20
21# MIPS 64r2 Soft Float 21# MIPS 64r2 Soft Float
22AVAILTUNES += "mips64r2-nf mips64r2el-nf" 22AVAILTUNES += "mips64r2-nf mips64r2el-nf"
23 23
24TUNE_FEATURES_tune-mips64r2-nf = "${TUNE_FEATURES_tune-mips64-nf} mips64r2" 24TUNE_FEATURES:tune-mips64r2-nf = "${TUNE_FEATURES:tune-mips64-nf} mips64r2"
25BASE_LIB_tune-mips64r2-nf = "lib64" 25BASE_LIB:tune-mips64r2-nf = "lib64"
26MIPSPKGSFX_VARIANT_tune-mips64r2-nf = "${TUNE_ARCH}" 26MIPSPKGSFX_VARIANT:tune-mips64r2-nf = "${TUNE_ARCH}"
27PACKAGE_EXTRA_ARCHS_tune-mips64r2-nf = "mips64-nf mips64r2-nf" 27PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf = "mips64-nf mips64r2-nf"
28 28
29TUNE_FEATURES_tune-mips64r2el-nf = "${TUNE_FEATURES_tune-mips64el-nf} mips64r2" 29TUNE_FEATURES:tune-mips64r2el-nf = "${TUNE_FEATURES:tune-mips64el-nf} mips64r2"
30BASE_LIB_tune-mips64r2el-nf = "lib64" 30BASE_LIB:tune-mips64r2el-nf = "lib64"
31MIPSPKGSFX_VARIANT_tune-mips64r2el-nf = "${TUNE_ARCH}" 31MIPSPKGSFX_VARIANT:tune-mips64r2el-nf = "${TUNE_ARCH}"
32PACKAGE_EXTRA_ARCHS_tune-mips64r2el-nf = "mips64el-nf mips64r2el-nf" 32PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf = "mips64el-nf mips64r2el-nf"
33 33
34# MIPS 64r2 n32 34# MIPS 64r2 n32
35AVAILTUNES += "mips64r2-n32 mips64r2el-n32" 35AVAILTUNES += "mips64r2-n32 mips64r2el-n32"
36 36
37TUNE_FEATURES_tune-mips64r2-n32 = "${TUNE_FEATURES_tune-mips64-n32} mips64r2" 37TUNE_FEATURES:tune-mips64r2-n32 = "${TUNE_FEATURES:tune-mips64-n32} mips64r2"
38BASE_LIB_tune-mips64r2-n32 = "lib32" 38BASE_LIB:tune-mips64r2-n32 = "lib32"
39MIPSPKGSFX_VARIANT_tune-mips64r2-n32 = "${TUNE_ARCH}" 39MIPSPKGSFX_VARIANT:tune-mips64r2-n32 = "${TUNE_ARCH}"
40PACKAGE_EXTRA_ARCHS_tune-mips64r2-n32 = "mips64-n32 mips64r2-n32" 40PACKAGE_EXTRA_ARCHS:tune-mips64r2-n32 = "mips64-n32 mips64r2-n32"
41 41
42TUNE_FEATURES_tune-mips64r2el-n32 = "${TUNE_FEATURES_tune-mips64el-n32} mips64r2" 42TUNE_FEATURES:tune-mips64r2el-n32 = "${TUNE_FEATURES:tune-mips64el-n32} mips64r2"
43BASE_LIB_tune-mips64r2el-n32 = "lib32" 43BASE_LIB:tune-mips64r2el-n32 = "lib32"
44MIPSPKGSFX_VARIANT_tune-mips64r2el-n32 = "${TUNE_ARCH}" 44MIPSPKGSFX_VARIANT:tune-mips64r2el-n32 = "${TUNE_ARCH}"
45PACKAGE_EXTRA_ARCHS_tune-mips64r2el-n32 = "mips64el-n32 mips64r2el-n32" 45PACKAGE_EXTRA_ARCHS:tune-mips64r2el-n32 = "mips64el-n32 mips64r2el-n32"
46 46
47# MIPS 64r2 n32 and Soft Float 47# MIPS 64r2 n32 and Soft Float
48AVAILTUNES += "mips64r2-nf-n32 mips64r2el-nf-n32" 48AVAILTUNES += "mips64r2-nf-n32 mips64r2el-nf-n32"
49 49
50TUNE_FEATURES_tune-mips64r2-nf-n32 = "${TUNE_FEATURES_tune-mips64-nf-n32} mips64r2" 50TUNE_FEATURES:tune-mips64r2-nf-n32 = "${TUNE_FEATURES:tune-mips64-nf-n32} mips64r2"
51BASE_LIB_tune-mips64r2-nf-n32 = "lib32" 51BASE_LIB:tune-mips64r2-nf-n32 = "lib32"
52MIPSPKGSFX_VARIANT_tune-mips64r2-nf-n32 = "${TUNE_ARCH}" 52MIPSPKGSFX_VARIANT:tune-mips64r2-nf-n32 = "${TUNE_ARCH}"
53PACKAGE_EXTRA_ARCHS_tune-mips64r2-nf-n32 = "mips64-nf-n32 mips64r2-nf-n32" 53PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-n32 = "mips64-nf-n32 mips64r2-nf-n32"
54 54
55TUNE_FEATURES_tune-mips64r2el-nf-n32 = "${TUNE_FEATURES_tune-mips64el-nf-n32} mips64r2" 55TUNE_FEATURES:tune-mips64r2el-nf-n32 = "${TUNE_FEATURES:tune-mips64el-nf-n32} mips64r2"
56BASE_LIB_tune-mips64r2el-nf-n32 = "lib32" 56BASE_LIB:tune-mips64r2el-nf-n32 = "lib32"
57MIPSPKGSFX_VARIANT_tune-mips64r2el-nf-n32 = "${TUNE_ARCH}" 57MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-n32 = "${TUNE_ARCH}"
58PACKAGE_EXTRA_ARCHS_tune-mips64r2el-nf-n32 = "mips64el-nf-n32 mips64r2el-nf-n32" 58PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-n32 = "mips64el-nf-n32 mips64r2el-nf-n32"
59 59
60# MIPS 64r2 o32 60# MIPS 64r2 o32
61AVAILTUNES += "mips64r2-o32 mips64r2el-o32" 61AVAILTUNES += "mips64r2-o32 mips64r2el-o32"
62 62
63TUNE_FEATURES_tune-mips64r2-o32 = "${TUNE_FEATURES_tune-mips64-o32} mips64r2" 63TUNE_FEATURES:tune-mips64r2-o32 = "${TUNE_FEATURES:tune-mips64-o32} mips64r2"
64BASE_LIB_tune-mips64r2-o32 = "lib" 64BASE_LIB:tune-mips64r2-o32 = "lib"
65MIPSPKGSFX_VARIANT_tune-mips64r2-o32 = "${TUNE_ARCH}" 65MIPSPKGSFX_VARIANT:tune-mips64r2-o32 = "${TUNE_ARCH}"
66PACKAGE_EXTRA_ARCHS_tune-mips64r2-o32 = "mips mips64-o32 mips64r2-o32" 66PACKAGE_EXTRA_ARCHS:tune-mips64r2-o32 = "mips mips64-o32 mips64r2-o32"
67 67
68TUNE_FEATURES_tune-mips64r2el-o32 = "${TUNE_FEATURES_tune-mips64el-o32} mips64r2" 68TUNE_FEATURES:tune-mips64r2el-o32 = "${TUNE_FEATURES:tune-mips64el-o32} mips64r2"
69BASE_LIB_tune-mips64r2el-o32 = "lib" 69BASE_LIB:tune-mips64r2el-o32 = "lib"
70MIPSPKGSFX_VARIANT_tune-mips64r2el-o32 = "${TUNE_ARCH}" 70MIPSPKGSFX_VARIANT:tune-mips64r2el-o32 = "${TUNE_ARCH}"
71PACKAGE_EXTRA_ARCHS_tune-mips64r2el-o32 = "mipsel mips64el-o32 mips64r2el-o32" 71PACKAGE_EXTRA_ARCHS:tune-mips64r2el-o32 = "mipsel mips64el-o32 mips64r2el-o32"
72 72
73# MIPS 64r2 o32 and Soft Float 73# MIPS 64r2 o32 and Soft Float
74AVAILTUNES += "mips64r2-nf-o32 mips64r2el-nf-o32" 74AVAILTUNES += "mips64r2-nf-o32 mips64r2el-nf-o32"
75 75
76TUNE_FEATURES_tune-mips64r2-nf-o32 = "${TUNE_FEATURES_tune-mips64-nf-o32} mips64r2" 76TUNE_FEATURES:tune-mips64r2-nf-o32 = "${TUNE_FEATURES:tune-mips64-nf-o32} mips64r2"
77BASE_LIB_tune-mips64r2-nf-o32 = "lib" 77BASE_LIB:tune-mips64r2-nf-o32 = "lib"
78MIPSPKGSFX_VARIANT_tune-mips64r2-nf-o32 = "${TUNE_ARCH}" 78MIPSPKGSFX_VARIANT:tune-mips64r2-nf-o32 = "${TUNE_ARCH}"
79PACKAGE_EXTRA_ARCHS_tune-mips64r2-nf-o32 = "mips-nf mips64r2-nf-o32" 79PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-o32 = "mips-nf mips64r2-nf-o32"
80 80
81TUNE_FEATURES_tune-mips64r2el-nf-o32 = "${TUNE_FEATURES_tune-mips64el-nf-o32} mips64r2" 81TUNE_FEATURES:tune-mips64r2el-nf-o32 = "${TUNE_FEATURES:tune-mips64el-nf-o32} mips64r2"
82BASE_LIB_tune-mips64r2el-nf-o32 = "lib" 82BASE_LIB:tune-mips64r2el-nf-o32 = "lib"
83MIPSPKGSFX_VARIANT_tune-mips64r2el-nf-o32 = "${TUNE_ARCH}" 83MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-o32 = "${TUNE_ARCH}"
84PACKAGE_EXTRA_ARCHS_tune-mips64r2el-nf-o32 = "mipsel-nf mips64r2el-nf-o32" 84PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-o32 = "mipsel-nf mips64r2el-nf-o32"
diff --git a/meta/conf/machine/include/tune-mips64r6.inc b/meta/conf/machine/include/tune-mips64r6.inc
index e53239a38b..b4a7e9ef1b 100644
--- a/meta/conf/machine/include/tune-mips64r6.inc
+++ b/meta/conf/machine/include/tune-mips64r6.inc
@@ -8,51 +8,51 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', ' -march=mi
8# Base Tunes 8# Base Tunes
9AVAILTUNES += "mipsisa64r6 mipsisa64r6el" 9AVAILTUNES += "mipsisa64r6 mipsisa64r6el"
10 10
11TUNE_FEATURES_tune-mipsisa64r6 = "bigendian fpu-hard n64 mipsisa64r6 r6" 11TUNE_FEATURES:tune-mipsisa64r6 = "bigendian fpu-hard n64 mipsisa64r6 r6"
12MIPSPKGSFX_VARIANT_tune-mipsisa64r6 = "${TUNE_ARCH}" 12MIPSPKGSFX_VARIANT:tune-mipsisa64r6 = "${TUNE_ARCH}"
13BASE_LIB_tune-mipsisa64r6 = "lib64" 13BASE_LIB:tune-mipsisa64r6 = "lib64"
14PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6 = "mipsisa64r6" 14PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6 = "mipsisa64r6"
15 15
16TUNE_FEATURES_tune-mipsisa64r6el = "fpu-hard r6 n64 mipsisa64r6" 16TUNE_FEATURES:tune-mipsisa64r6el = "fpu-hard r6 n64 mipsisa64r6"
17MIPSPKGSFX_VARIANT_tune-mipsisa64r6el = "${TUNE_ARCH}" 17MIPSPKGSFX_VARIANT:tune-mipsisa64r6el = "${TUNE_ARCH}"
18BASE_LIB_tune-mipsisa64r6el = "lib64" 18BASE_LIB:tune-mipsisa64r6el = "lib64"
19PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el = "mipsisa64r6el" 19PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6el = "mipsisa64r6el"
20 20
21# Soft Float 21# Soft Float
22AVAILTUNES += "mipsisa64r6-nf mipsisa64r6el-nf" 22AVAILTUNES += "mipsisa64r6-nf mipsisa64r6el-nf"
23 23
24TUNE_FEATURES_tune-mipsisa64r6-nf = "bigendian r6 n64 mipsisa64r6" 24TUNE_FEATURES:tune-mipsisa64r6-nf = "bigendian r6 n64 mipsisa64r6"
25MIPSPKGSFX_VARIANT_tune-mipsisa64r6-nf = "${TUNE_ARCH}" 25MIPSPKGSFX_VARIANT:tune-mipsisa64r6-nf = "${TUNE_ARCH}"
26BASE_LIB_tune-mipsisa64r6-nf = "lib64" 26BASE_LIB:tune-mipsisa64r6-nf = "lib64"
27PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-nf = "mipsisa64r6-nf" 27PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6-nf = "mipsisa64r6-nf"
28 28
29TUNE_FEATURES_tune-mipsisa64r6el-nf = "r6 n64 mipsisa64r6" 29TUNE_FEATURES:tune-mipsisa64r6el-nf = "r6 n64 mipsisa64r6"
30MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-nf = "${TUNE_ARCH}" 30MIPSPKGSFX_VARIANT:tune-mipsisa64r6el-nf = "${TUNE_ARCH}"
31BASE_LIB_tune-mipsisa64r6el-nf = "lib64" 31BASE_LIB:tune-mipsisa64r6el-nf = "lib64"
32PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-nf = "mipsisa64r6el-nf" 32PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6el-nf = "mipsisa64r6el-nf"
33 33
34# MIPS 64r6 n32 34# MIPS 64r6 n32
35AVAILTUNES += "mipsisa64r6-n32 mipsisa64r6el-n32" 35AVAILTUNES += "mipsisa64r6-n32 mipsisa64r6el-n32"
36 36
37TUNE_FEATURES_tune-mipsisa64r6-n32 = "bigendian fpu-hard r6 n32 mipsisa64r6" 37TUNE_FEATURES:tune-mipsisa64r6-n32 = "bigendian fpu-hard r6 n32 mipsisa64r6"
38BASE_LIB_tune-mipsisa64r6-n32 = "lib32" 38BASE_LIB:tune-mipsisa64r6-n32 = "lib32"
39MIPSPKGSFX_VARIANT_tune-mipsisa64r6-n32 = "${TUNE_ARCH}" 39MIPSPKGSFX_VARIANT:tune-mipsisa64r6-n32 = "${TUNE_ARCH}"
40PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-n32 = "mipsisa64r6-n32" 40PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6-n32 = "mipsisa64r6-n32"
41 41
42TUNE_FEATURES_tune-mipsisa64r6el-n32 = "fpu-hard r6 n32 mipsisa64r6" 42TUNE_FEATURES:tune-mipsisa64r6el-n32 = "fpu-hard r6 n32 mipsisa64r6"
43BASE_LIB_tune-mipsisa64r6el-n32 = "lib32" 43BASE_LIB:tune-mipsisa64r6el-n32 = "lib32"
44MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-n32 = "${TUNE_ARCH}" 44MIPSPKGSFX_VARIANT:tune-mipsisa64r6el-n32 = "${TUNE_ARCH}"
45PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-n32 = "mipsisa64r6el-n32" 45PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6el-n32 = "mipsisa64r6el-n32"
46 46
47# MIPS 64r6 n32 and Soft Float 47# MIPS 64r6 n32 and Soft Float
48AVAILTUNES += "mipsisa64r6-nf-n32 mipsisa64r6el-nf-n32" 48AVAILTUNES += "mipsisa64r6-nf-n32 mipsisa64r6el-nf-n32"
49 49
50TUNE_FEATURES_tune-mipsisa64r6-nf-n32 = "bigendian r6 n32 mipsisa64r6" 50TUNE_FEATURES:tune-mipsisa64r6-nf-n32 = "bigendian r6 n32 mipsisa64r6"
51BASE_LIB_tune-mipsisa64r6-nf-n32 = "lib32" 51BASE_LIB:tune-mipsisa64r6-nf-n32 = "lib32"
52MIPSPKGSFX_VARIANT_tune-mipsisa64r6-nf-n32 = "${TUNE_ARCH}" 52MIPSPKGSFX_VARIANT:tune-mipsisa64r6-nf-n32 = "${TUNE_ARCH}"
53PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-nf-n32 = "mipsisa64r6-nf-n32" 53PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6-nf-n32 = "mipsisa64r6-nf-n32"
54 54
55TUNE_FEATURES_tune-mipsisa64r6el-nf-n32 = "r6 n32 mipsisa64r6" 55TUNE_FEATURES:tune-mipsisa64r6el-nf-n32 = "r6 n32 mipsisa64r6"
56BASE_LIB_tune-mipsisa64r6el-nf-n32 = "lib32" 56BASE_LIB:tune-mipsisa64r6el-nf-n32 = "lib32"
57MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-nf-n32 = "${TUNE_ARCH}" 57MIPSPKGSFX_VARIANT:tune-mipsisa64r6el-nf-n32 = "${TUNE_ARCH}"
58PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-nf-n32 = "mipsisa64r6el-nf-n32" 58PACKAGE_EXTRA_ARCHS:tune-mipsisa64r6el-nf-n32 = "mipsisa64r6el-nf-n32"
diff --git a/meta/conf/machine/include/tune-octeon.inc b/meta/conf/machine/include/tune-octeon.inc
index b5deb8fd88..455c6a2f33 100644
--- a/meta/conf/machine/include/tune-octeon.inc
+++ b/meta/conf/machine/include/tune-octeon.inc
@@ -7,26 +7,26 @@ AVAILTUNES += "octeon2 octeon2_64 octeon3 octeon3_64"
7TUNEVALID[octeon2] = "Enable optimization related to octeon2 support" 7TUNEVALID[octeon2] = "Enable optimization related to octeon2 support"
8TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'octeon2', ' -march=octeon2 ', '',d)}" 8TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'octeon2', ' -march=octeon2 ', '',d)}"
9 9
10TUNE_FEATURES_tune-octeon2 = "${TUNE_FEATURES_tune-mips64-n32} octeon2" 10TUNE_FEATURES:tune-octeon2 = "${TUNE_FEATURES:tune-mips64-n32} octeon2"
11BASE_LIB_tune-octeon2 = "lib32" 11BASE_LIB:tune-octeon2 = "lib32"
12MIPSPKGSFX_VARIANT_tune-octeon2 = "octeon2" 12MIPSPKGSFX_VARIANT:tune-octeon2 = "octeon2"
13PACKAGE_EXTRA_ARCHS_tune-octeon2 = "mips64-n32 octeon2-n32" 13PACKAGE_EXTRA_ARCHS:tune-octeon2 = "mips64-n32 octeon2-n32"
14 14
15TUNE_FEATURES_tune-octeon2_64 = "${TUNE_FEATURES_tune-mips64} octeon2" 15TUNE_FEATURES:tune-octeon2_64 = "${TUNE_FEATURES:tune-mips64} octeon2"
16BASE_LIB_tune-octeon2_64 = "lib64" 16BASE_LIB:tune-octeon2_64 = "lib64"
17MIPSPKGSFX_VARIANT_tune-octeon2_64 = "octeon2_64" 17MIPSPKGSFX_VARIANT:tune-octeon2_64 = "octeon2_64"
18PACKAGE_EXTRA_ARCHS_tune-octeon2_64 = "mips64 octeon2_64" 18PACKAGE_EXTRA_ARCHS:tune-octeon2_64 = "mips64 octeon2_64"
19 19
20 20
21TUNEVALID[octeon3] = "Enable optimization related to octeon3 support" 21TUNEVALID[octeon3] = "Enable optimization related to octeon3 support"
22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'octeon3', ' -march=octeon3 ', '',d)}" 22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'octeon3', ' -march=octeon3 ', '',d)}"
23 23
24TUNE_FEATURES_tune-octeon3 = "${TUNE_FEATURES_tune-mips64-n32} octeon3" 24TUNE_FEATURES:tune-octeon3 = "${TUNE_FEATURES:tune-mips64-n32} octeon3"
25BASE_LIB_tune-octeon3 = "lib32" 25BASE_LIB:tune-octeon3 = "lib32"
26MIPSPKGSFX_VARIANT_tune-octeon3 = "octeon3" 26MIPSPKGSFX_VARIANT:tune-octeon3 = "octeon3"
27PACKAGE_EXTRA_ARCHS_tune-octeon3 = "mips64-n32 octeon3-n32" 27PACKAGE_EXTRA_ARCHS:tune-octeon3 = "mips64-n32 octeon3-n32"
28 28
29TUNE_FEATURES_tune-octeon3_64 = "${TUNE_FEATURES_tune-mips64} octeon3" 29TUNE_FEATURES:tune-octeon3_64 = "${TUNE_FEATURES:tune-mips64} octeon3"
30BASE_LIB_tune-octeon3_64 = "lib64" 30BASE_LIB:tune-octeon3_64 = "lib64"
31MIPSPKGSFX_VARIANT_tune-octeon3_64 = "octeon3_64" 31MIPSPKGSFX_VARIANT:tune-octeon3_64 = "octeon3_64"
32PACKAGE_EXTRA_ARCHS_tune-octeon3_64 = "mips64 octeon3_64" 32PACKAGE_EXTRA_ARCHS:tune-octeon3_64 = "mips64 octeon3_64"
diff --git a/meta/conf/machine/include/tune-power5.inc b/meta/conf/machine/include/tune-power5.inc
index 48c33fb273..e70e401217 100644
--- a/meta/conf/machine/include/tune-power5.inc
+++ b/meta/conf/machine/include/tune-power5.inc
@@ -6,19 +6,19 @@ TUNEVALID[power5] = "Enable IBM Power5 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' -mcpu=power5', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' -mcpu=power5', '', d)}"
7 7
8AVAILTUNES += "ppcp5 ppc64p5" 8AVAILTUNES += "ppcp5 ppc64p5"
9TUNE_FEATURES_tune-ppcp5 = "m32 fpu-hard power5 altivec bigendian" 9TUNE_FEATURES:tune-ppcp5 = "m32 fpu-hard power5 altivec bigendian"
10BASE_LIB_tune-ppcp5 = "lib" 10BASE_LIB:tune-ppcp5 = "lib"
11TUNE_PKGARCH_tune-ppcp5 = "ppcp5" 11TUNE_PKGARCH:tune-ppcp5 = "ppcp5"
12PACKAGE_EXTRA_ARCHS_tune-ppcp5 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp5" 12PACKAGE_EXTRA_ARCHS:tune-ppcp5 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppcp5"
13 13
14TUNE_FEATURES_tune-ppc64p5 = "m64 fpu-hard power5 altivec bigendian" 14TUNE_FEATURES:tune-ppc64p5 = "m64 fpu-hard power5 altivec bigendian"
15BASE_LIB_tune-ppc64p5 = "lib64" 15BASE_LIB:tune-ppc64p5 = "lib64"
16TUNE_PKGARCH_tune-ppc64p5 = "ppc64p5" 16TUNE_PKGARCH:tune-ppc64p5 = "ppc64p5"
17PACKAGE_EXTRA_ARCHS_tune-ppc64p5 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p5" 17PACKAGE_EXTRA_ARCHS:tune-ppc64p5 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64p5"
18 18
19# glibc configure options to get power5 specific library 19# glibc configure options to get power5 specific library
20GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}" 20GLIBC_EXTRA_OECONF:powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}"
21GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}" 21GLIBC_EXTRA_OECONF:powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power5', '--with-cpu=power5', '', d)}"
22 22
23# QEMU usermode fails with invalid instruction error 23# QEMU usermode fails with invalid instruction error
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/tune-power6.inc b/meta/conf/machine/include/tune-power6.inc
index b708660217..eaf89515ca 100644
--- a/meta/conf/machine/include/tune-power6.inc
+++ b/meta/conf/machine/include/tune-power6.inc
@@ -6,19 +6,19 @@ TUNEVALID[power6] = "Enable IBM Power6 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' -mcpu=power6', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' -mcpu=power6', '', d)}"
7 7
8AVAILTUNES += "ppcp6 ppc64p6" 8AVAILTUNES += "ppcp6 ppc64p6"
9TUNE_FEATURES_tune-ppcp6 = "m32 fpu-hard power6 altivec bigendian" 9TUNE_FEATURES:tune-ppcp6 = "m32 fpu-hard power6 altivec bigendian"
10BASE_LIB_tune-ppcp6 = "lib" 10BASE_LIB:tune-ppcp6 = "lib"
11TUNE_PKGARCH_tune-ppcp6 = "ppcp6" 11TUNE_PKGARCH:tune-ppcp6 = "ppcp6"
12PACKAGE_EXTRA_ARCHS_tune-ppcp6 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp6" 12PACKAGE_EXTRA_ARCHS:tune-ppcp6 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppcp6"
13 13
14TUNE_FEATURES_tune-ppc64p6 = "m64 fpu-hard power6 altivec bigendian" 14TUNE_FEATURES:tune-ppc64p6 = "m64 fpu-hard power6 altivec bigendian"
15BASE_LIB_tune-ppc64p6 = "lib64" 15BASE_LIB:tune-ppc64p6 = "lib64"
16TUNE_PKGARCH_tune-ppc64p6 = "ppc64p6" 16TUNE_PKGARCH:tune-ppc64p6 = "ppc64p6"
17PACKAGE_EXTRA_ARCHS_tune-ppc64p6 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p6" 17PACKAGE_EXTRA_ARCHS:tune-ppc64p6 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64p6"
18 18
19# glibc configure options to get power6 specific library 19# glibc configure options to get power6 specific library
20GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}" 20GLIBC_EXTRA_OECONF:powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}"
21GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}" 21GLIBC_EXTRA_OECONF:powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power6', '--with-cpu=power6', '', d)}"
22 22
23# QEMU usermode fails with invalid instruction error 23# QEMU usermode fails with invalid instruction error
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/tune-power7.inc b/meta/conf/machine/include/tune-power7.inc
index e976cc0467..4531ddd85f 100644
--- a/meta/conf/machine/include/tune-power7.inc
+++ b/meta/conf/machine/include/tune-power7.inc
@@ -6,19 +6,19 @@ TUNEVALID[power7] = "Enable IBM Power7 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' -mcpu=power7', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' -mcpu=power7', '', d)}"
7 7
8AVAILTUNES += "ppcp7 ppc64p7" 8AVAILTUNES += "ppcp7 ppc64p7"
9TUNE_FEATURES_tune-ppcp7 = "m32 fpu-hard power7 altivec bigendian" 9TUNE_FEATURES:tune-ppcp7 = "m32 fpu-hard power7 altivec bigendian"
10BASE_LIB_tune-ppcp7 = "lib" 10BASE_LIB:tune-ppcp7 = "lib"
11TUNE_PKGARCH_tune-ppcp7 = "ppcp7" 11TUNE_PKGARCH:tune-ppcp7 = "ppcp7"
12PACKAGE_EXTRA_ARCHS_tune-ppcp7 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp7" 12PACKAGE_EXTRA_ARCHS:tune-ppcp7 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppcp7"
13 13
14TUNE_FEATURES_tune-ppc64p7 = "m64 fpu-hard power7 altivec bigendian" 14TUNE_FEATURES:tune-ppc64p7 = "m64 fpu-hard power7 altivec bigendian"
15BASE_LIB_tune-ppc64p7 = "lib64" 15BASE_LIB:tune-ppc64p7 = "lib64"
16TUNE_PKGARCH_tune-ppc64p7 = "ppc64p7" 16TUNE_PKGARCH:tune-ppc64p7 = "ppc64p7"
17PACKAGE_EXTRA_ARCHS_tune-ppc64p7 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p7" 17PACKAGE_EXTRA_ARCHS:tune-ppc64p7 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64p7"
18 18
19# glibc configure options to get power7 specific library 19# glibc configure options to get power7 specific library
20GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}" 20GLIBC_EXTRA_OECONF:powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}"
21GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}" 21GLIBC_EXTRA_OECONF:powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power7', '--with-cpu=power7', '', d)}"
22 22
23# QEMU usermode fails with invalid instruction error 23# QEMU usermode fails with invalid instruction error
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/tune-power9.inc b/meta/conf/machine/include/tune-power9.inc
index 401b73744f..6744731f8e 100644
--- a/meta/conf/machine/include/tune-power9.inc
+++ b/meta/conf/machine/include/tune-power9.inc
@@ -7,25 +7,25 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power9', ' -mcpu=power9',
7 7
8AVAILTUNES += "ppcp9 ppc64p9 ppcp9le ppc64p9le" 8AVAILTUNES += "ppcp9 ppc64p9 ppcp9le ppc64p9le"
9 9
10TUNE_FEATURES_tune-ppcp9 = "m32 fpu-hard power9 altivec bigendian" 10TUNE_FEATURES:tune-ppcp9 = "m32 fpu-hard power9 altivec bigendian"
11BASE_LIB_tune-ppcp9 = "lib" 11BASE_LIB:tune-ppcp9 = "lib"
12TUNE_PKGARCH_tune-ppcp9 = "ppcp9" 12TUNE_PKGARCH:tune-ppcp9 = "ppcp9"
13PACKAGE_EXTRA_ARCHS_tune-ppcp9 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp9" 13PACKAGE_EXTRA_ARCHS:tune-ppcp9 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppcp9"
14 14
15TUNE_FEATURES_tune-ppc64p9 = "m64 fpu-hard power9 altivec bigendian" 15TUNE_FEATURES:tune-ppc64p9 = "m64 fpu-hard power9 altivec bigendian"
16BASE_LIB_tune-ppc64p9 = "lib64" 16BASE_LIB:tune-ppc64p9 = "lib64"
17TUNE_PKGARCH_tune-ppc64p9 = "ppc64p9" 17TUNE_PKGARCH:tune-ppc64p9 = "ppc64p9"
18PACKAGE_EXTRA_ARCHS_tune-ppc64p9 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p9" 18PACKAGE_EXTRA_ARCHS:tune-ppc64p9 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64p9"
19 19
20TUNE_FEATURES_tune-ppcp9le = "m32 fpu-hard power9 altivec" 20TUNE_FEATURES:tune-ppcp9le = "m32 fpu-hard power9 altivec"
21BASE_LIB_tune-ppcp9le = "lib" 21BASE_LIB:tune-ppcp9le = "lib"
22TUNE_PKGARCH_tune-ppcp9le = "ppcp9le" 22TUNE_PKGARCH:tune-ppcp9le = "ppcp9le"
23PACKAGE_EXTRA_ARCHS_tune-ppcp9le = "${PACKAGE_EXTRA_ARCHS_tune-powerpcle} ppcp9le" 23PACKAGE_EXTRA_ARCHS:tune-ppcp9le = "${PACKAGE_EXTRA_ARCHS:tune-powerpcle} ppcp9le"
24 24
25TUNE_FEATURES_tune-ppc64p9le = "m64 fpu-hard power9 altivec" 25TUNE_FEATURES:tune-ppc64p9le = "m64 fpu-hard power9 altivec"
26BASE_LIB_tune-ppc64p9le = "lib64" 26BASE_LIB:tune-ppc64p9le = "lib64"
27TUNE_PKGARCH_tune-ppc64p9le = "ppc64p9le" 27TUNE_PKGARCH:tune-ppc64p9le = "ppc64p9le"
28PACKAGE_EXTRA_ARCHS_tune-ppc64p9le = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64le} ppc64p9le" 28PACKAGE_EXTRA_ARCHS:tune-ppc64p9le = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64le} ppc64p9le"
29 29
30# glibc configure options to get power9 specific library 30# glibc configure options to get power9 specific library
31GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'power9', '--with-cpu=power9', '', d)}" 31GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'power9', '--with-cpu=power9', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppc476.inc b/meta/conf/machine/include/tune-ppc476.inc
index 31eecc435c..54152cb941 100644
--- a/meta/conf/machine/include/tune-ppc476.inc
+++ b/meta/conf/machine/include/tune-ppc476.inc
@@ -6,9 +6,9 @@ TUNEVALID[ppc476] = "Enable ppc476 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc476', ' -mcpu=476', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc476', ' -mcpu=476', '', d)}"
7 7
8AVAILTUNES += "ppc476" 8AVAILTUNES += "ppc476"
9TUNE_FEATURES_tune-ppc476 = "m32 fpu-hard ppc476 bigendian" 9TUNE_FEATURES:tune-ppc476 = "m32 fpu-hard ppc476 bigendian"
10TUNE_PKGARCH_tune-ppc476 = "ppc476" 10TUNE_PKGARCH:tune-ppc476 = "ppc476"
11PACKAGE_EXTRA_ARCHS_tune-ppc476 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc476" 11PACKAGE_EXTRA_ARCHS:tune-ppc476 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppc476"
12 12
13# glibc configure options to get 476 specific library (for sqrt) 13# glibc configure options to get 476 specific library (for sqrt)
14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc476', '-with-cpu=476', '', d)}" 14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc476', '-with-cpu=476', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index b110f13870..8beec00f24 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -6,9 +6,9 @@ TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', ' -mcpu=603e', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', ' -mcpu=603e', '', d)}"
7 7
8AVAILTUNES += "ppc603e" 8AVAILTUNES += "ppc603e"
9TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e bigendian" 9TUNE_FEATURES:tune-ppc603e = "m32 fpu-hard ppc603e bigendian"
10TUNE_PKGARCH_tune-ppc603e = "ppc603e" 10TUNE_PKGARCH:tune-ppc603e = "ppc603e"
11PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e" 11PACKAGE_EXTRA_ARCHS:tune-ppc603e = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppc603e"
12 12
13# glibc configure options to get 603e specific library (for sqrt) 13# glibc configure options to get 603e specific library (for sqrt)
14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', '-with-cpu=603e', '', d)}" 14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', '-with-cpu=603e', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppc7400.inc b/meta/conf/machine/include/tune-ppc7400.inc
index 92d902994b..1e2c9fc2ce 100644
--- a/meta/conf/machine/include/tune-ppc7400.inc
+++ b/meta/conf/machine/include/tune-ppc7400.inc
@@ -6,9 +6,9 @@ TUNEVALID[ppc7400] = "Enable ppc7400 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', ' -mcpu=7400 -mno-spe', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', ' -mcpu=7400 -mno-spe', '', d)}"
7 7
8AVAILTUNES += "ppc7400" 8AVAILTUNES += "ppc7400"
9TUNE_FEATURES_tune-ppc7400 = "m32 fpu-hard ppc7400 altivec bigendian" 9TUNE_FEATURES:tune-ppc7400 = "m32 fpu-hard ppc7400 altivec bigendian"
10TUNE_PKGARCH_tune-ppc7400 = "ppc7400" 10TUNE_PKGARCH:tune-ppc7400 = "ppc7400"
11PACKAGE_EXTRA_ARCHS_tune-ppc7400 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc7400" 11PACKAGE_EXTRA_ARCHS:tune-ppc7400 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppc7400"
12 12
13# glibc configure options to get 7400 specific library (for sqrt) 13# glibc configure options to get 7400 specific library (for sqrt)
14#GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', '--with-cpu=power4', '', d)}" 14#GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', '--with-cpu=power4', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index 6adeb4bdec..90171c76d5 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -6,6 +6,6 @@ TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c2', ' -mcpu=e300c2', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c2', ' -mcpu=e300c2', '', d)}"
7 7
8AVAILTUNES += "ppce300c2" 8AVAILTUNES += "ppce300c2"
9TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2 bigendian" 9TUNE_FEATURES:tune-ppce300c2 = "m32 fpu-soft ppce300c2 bigendian"
10TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2" 10TUNE_PKGARCH:tune-ppce300c2 = "ppce300c2"
11PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2" 11PACKAGE_EXTRA_ARCHS:tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc-nf} ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce300c3.inc b/meta/conf/machine/include/tune-ppce300c3.inc
index a3d836c50c..b74b6ad976 100644
--- a/meta/conf/machine/include/tune-ppce300c3.inc
+++ b/meta/conf/machine/include/tune-ppce300c3.inc
@@ -6,9 +6,9 @@ AVAILTUNES += "ppce300c3 ppce300c3-nf"
6 6
7# hard-float 7# hard-float
8TUNEVALID[ppce300c3] = "Enable ppce300c3 specific processor optimizations" 8TUNEVALID[ppce300c3] = "Enable ppce300c3 specific processor optimizations"
9TUNE_FEATURES_tune-ppce300c3 = "${TUNE_FEATURES_tune-powerpc} ppce300c3" 9TUNE_FEATURES:tune-ppce300c3 = "${TUNE_FEATURES:tune-powerpc} ppce300c3"
10TUNE_PKGARCH_tune-ppce300c3 = "ppce300c3" 10TUNE_PKGARCH:tune-ppce300c3 = "ppce300c3"
11PACKAGE_EXTRA_ARCHS_tune-ppce300c3 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce300c3" 11PACKAGE_EXTRA_ARCHS:tune-ppce300c3 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce300c3"
12TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c3', ' -mcpu=e300c3', '', d)}" 12TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c3', ' -mcpu=e300c3', '', d)}"
13 13
14# glibc config options to make use of e300c3 (603e) specific sqrt/sqrtf routines 14# glibc config options to make use of e300c3 (603e) specific sqrt/sqrtf routines
@@ -16,8 +16,8 @@ GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c3', '--wit
16 16
17# soft-float 17# soft-float
18TUNEVALID[ppce300c3-nf] = "Enable ppce300c3 specific processor optimizations (no fpu)" 18TUNEVALID[ppce300c3-nf] = "Enable ppce300c3 specific processor optimizations (no fpu)"
19TUNE_FEATURES_tune-ppce300c3-nf = "${TUNE_FEATURES_tune-powerpc-nf} ppce300c3-nf" 19TUNE_FEATURES:tune-ppce300c3-nf = "${TUNE_FEATURES:tune-powerpc-nf} ppce300c3-nf"
20TUNE_PKGARCH_tune-ppce300c3-nf = "ppce300c3-nf" 20TUNE_PKGARCH:tune-ppce300c3-nf = "ppce300c3-nf"
21PACKAGE_EXTRA_ARCHS_tune-ppce300c3-nf = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c3-nf" 21PACKAGE_EXTRA_ARCHS:tune-ppce300c3-nf = "${PACKAGE_EXTRA_ARCHS:tune-powerpc-nf} ppce300c3-nf"
22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c3-nf', ' -mcpu=e300c3', '', d)}" 22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c3-nf', ' -mcpu=e300c3', '', d)}"
23 23
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index abf81b90c4..aceab321b7 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -15,6 +15,6 @@ SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}" 15ABIEXTENSION .= "${SPEABIEXTENSION}"
16 16
17AVAILTUNES += "ppce500" 17AVAILTUNES += "ppce500"
18TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500 bigendian" 18TUNE_FEATURES:tune-ppce500 = "m32 spe ppce500 bigendian"
19TUNE_PKGARCH_tune-ppce500 = "ppce500" 19TUNE_PKGARCH:tune-ppce500 = "ppce500"
20PACKAGE_EXTRA_ARCHS_tune-ppce500 = "ppce500" 20PACKAGE_EXTRA_ARCHS:tune-ppce500 = "ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 9f8a172804..e3524a10ca 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -6,9 +6,9 @@ TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', ' -mcpu=e500mc', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', ' -mcpu=e500mc', '', d)}"
7 7
8AVAILTUNES += "ppce500mc" 8AVAILTUNES += "ppce500mc"
9TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc bigendian" 9TUNE_FEATURES:tune-ppce500mc = "m32 fpu-hard ppce500mc bigendian"
10TUNE_PKGARCH_tune-ppce500mc = "ppce500mc" 10TUNE_PKGARCH:tune-ppce500mc = "ppce500mc"
11PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc" 11PACKAGE_EXTRA_ARCHS:tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce500mc"
12 12
13# glibc configure options to get e500mc specific library (for sqrt) 13# glibc configure options to get e500mc specific library (for sqrt)
14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', '-with-cpu=e500mc', '', d)}" 14GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', '-with-cpu=e500mc', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index f6c7c17623..461164d818 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -15,6 +15,6 @@ SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}" 15ABIEXTENSION .= "${SPEABIEXTENSION}"
16 16
17AVAILTUNES += "ppce500v2" 17AVAILTUNES += "ppce500v2"
18TUNE_FEATURES_tune-ppce500v2 = "m32 ppce500v2 bigendian" 18TUNE_FEATURES:tune-ppce500v2 = "m32 ppce500v2 bigendian"
19TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2" 19TUNE_PKGARCH:tune-ppce500v2 = "ppce500v2"
20PACKAGE_EXTRA_ARCHS_tune-ppce500v2 = "ppce500v2" 20PACKAGE_EXTRA_ARCHS:tune-ppce500v2 = "ppce500v2"
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/tune-ppce5500.inc
index acc6a50fca..2cf7b1737c 100644
--- a/meta/conf/machine/include/tune-ppce5500.inc
+++ b/meta/conf/machine/include/tune-ppce5500.inc
@@ -6,18 +6,18 @@ TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' -mcpu=e5500', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' -mcpu=e5500', '', d)}"
7 7
8AVAILTUNES += "ppce5500 ppc64e5500" 8AVAILTUNES += "ppce5500 ppc64e5500"
9TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500 bigendian" 9TUNE_FEATURES:tune-ppce5500 = "m32 fpu-hard e5500 bigendian"
10BASE_LIB_tune-ppce5500 = "lib" 10BASE_LIB:tune-ppce5500 = "lib"
11TUNE_PKGARCH_tune-ppce5500 = "ppce5500" 11TUNE_PKGARCH:tune-ppce5500 = "ppce5500"
12PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500" 12PACKAGE_EXTRA_ARCHS:tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce5500"
13 13
14TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500 bigendian" 14TUNE_FEATURES:tune-ppc64e5500 = "m64 fpu-hard e5500 bigendian"
15BASE_LIB_tune-ppc64e5500 = "lib64" 15BASE_LIB:tune-ppc64e5500 = "lib64"
16TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500" 16TUNE_PKGARCH:tune-ppc64e5500 = "ppc64e5500"
17PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500" 17PACKAGE_EXTRA_ARCHS:tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64e5500"
18 18
19# glibc configure options to get e5500 specific library (for sqrt) 19# glibc configure options to get e5500 specific library (for sqrt)
20GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'e5500', '--with-cpu=e5500', '', d)}" 20GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'e5500', '--with-cpu=e5500', '', d)}"
21 21
22# QEMU usermode fails with invalid instruction error (YOCTO: #10304) 22# QEMU usermode fails with invalid instruction error (YOCTO: #10304)
23MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' qemu-usermode', '', d)}" 23MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/tune-ppce6500.inc b/meta/conf/machine/include/tune-ppce6500.inc
index d12d218d06..e78de350ad 100644
--- a/meta/conf/machine/include/tune-ppce6500.inc
+++ b/meta/conf/machine/include/tune-ppce6500.inc
@@ -6,19 +6,19 @@ TUNEVALID[e6500] = "Enable Freescale e6500 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' -mcpu=e6500', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' -mcpu=e6500', '', d)}"
7 7
8AVAILTUNES += "ppce6500 ppc64e6500" 8AVAILTUNES += "ppce6500 ppc64e6500"
9TUNE_FEATURES_tune-ppce6500 = "m32 fpu-hard e6500 altivec bigendian" 9TUNE_FEATURES:tune-ppce6500 = "m32 fpu-hard e6500 altivec bigendian"
10BASE_LIB_tune-ppce6500 = "lib" 10BASE_LIB:tune-ppce6500 = "lib"
11TUNE_PKGARCH_tune-ppce6500 = "ppce6500" 11TUNE_PKGARCH:tune-ppce6500 = "ppce6500"
12PACKAGE_EXTRA_ARCHS_tune-ppce6500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce6500" 12PACKAGE_EXTRA_ARCHS:tune-ppce6500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce6500"
13 13
14TUNE_FEATURES_tune-ppc64e6500 = "m64 fpu-hard e6500 altivec bigendian" 14TUNE_FEATURES:tune-ppc64e6500 = "m64 fpu-hard e6500 altivec bigendian"
15BASE_LIB_tune-ppc64e6500 = "lib64" 15BASE_LIB:tune-ppc64e6500 = "lib64"
16TUNE_PKGARCH_tune-ppc64e6500 = "ppc64e6500" 16TUNE_PKGARCH:tune-ppc64e6500 = "ppc64e6500"
17PACKAGE_EXTRA_ARCHS_tune-ppc64e6500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e6500" 17PACKAGE_EXTRA_ARCHS:tune-ppc64e6500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64e6500"
18 18
19# glibc configure options to get e6500 specific library 19# glibc configure options to get e6500 specific library
20GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'e6500', '--with-cpu=e6500', '', d)}" 20GLIBC_EXTRA_OECONF:powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'e6500', '--with-cpu=e6500', '', d)}"
21GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'e6500', '--with-cpu=e6500', '', d)}" 21GLIBC_EXTRA_OECONF:powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'e6500', '--with-cpu=e6500', '', d)}"
22 22
23# QEMU usermode fails with invalid instruction error (YOCTO: #10304) 23# QEMU usermode fails with invalid instruction error (YOCTO: #10304)
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' qemu-usermode', '', d)}"
diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc
index 80df9a0b61..77d0b71fc4 100644
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/meta/conf/machine/include/tune-sh3.inc
@@ -6,12 +6,12 @@ TUNEVALID[sh3] = "Enable SH3 optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh3', ' -m3', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh3', ' -m3', '', d)}"
7 7
8AVAILTUNES += "sh3 sh3eb" 8AVAILTUNES += "sh3 sh3eb"
9TUNE_FEATURES_tune-sh3 = "sh3" 9TUNE_FEATURES:tune-sh3 = "sh3"
10TUNE_ARCH_tune-sh3 = "sh3" 10TUNE_ARCH:tune-sh3 = "sh3"
11TUNE_PKGARCH_tune-sh3 = "sh3" 11TUNE_PKGARCH:tune-sh3 = "sh3"
12PACKAGE_EXTRA_ARCHS_tune-sh3 = "sh sh3" 12PACKAGE_EXTRA_ARCHS:tune-sh3 = "sh sh3"
13 13
14TUNE_FEATURES_tune-sh3eb = "sh3 bigendian" 14TUNE_FEATURES:tune-sh3eb = "sh3 bigendian"
15TUNE_ARCH_tune-sh3eb = "sh3eb" 15TUNE_ARCH:tune-sh3eb = "sh3eb"
16TUNE_PKGARCH_tune-sh3eb = "sh3eb" 16TUNE_PKGARCH:tune-sh3eb = "sh3eb"
17PACKAGE_EXTRA_ARCHS_tune-sh3eb = "sheb sh3eb" 17PACKAGE_EXTRA_ARCHS:tune-sh3eb = "sheb sh3eb"
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc
index 4160c30e1a..e21ede36c4 100644
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/meta/conf/machine/include/tune-sh4.inc
@@ -13,22 +13,22 @@ TUNEVALID[sh4a] = "Enable SH4a optimizations"
13TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh4a', ' -m4a', '', d)}" 13TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh4a', ' -m4a', '', d)}"
14 14
15AVAILTUNES += "sh4 sh4eb sh4a sh4aeb" 15AVAILTUNES += "sh4 sh4eb sh4a sh4aeb"
16TUNE_FEATURES_tune-sh4 = "sh4" 16TUNE_FEATURES:tune-sh4 = "sh4"
17TUNE_ARCH_tune-sh4 = "sh4" 17TUNE_ARCH:tune-sh4 = "sh4"
18TUNE_PKGARCH_tune-sh4 = "sh4" 18TUNE_PKGARCH:tune-sh4 = "sh4"
19PACKAGE_EXTRA_ARCHS_tune-sh4 = "sh sh4" 19PACKAGE_EXTRA_ARCHS:tune-sh4 = "sh sh4"
20 20
21TUNE_FEATURES_tune-sh4eb = "sh4 bigendian" 21TUNE_FEATURES:tune-sh4eb = "sh4 bigendian"
22TUNE_ARCH_tune-sh4eb = "sh4eb" 22TUNE_ARCH:tune-sh4eb = "sh4eb"
23TUNE_PKGARCH_tune-sh4eb = "sh4eb" 23TUNE_PKGARCH:tune-sh4eb = "sh4eb"
24PACKAGE_EXTRA_ARCHS_tune-sh4eb = "sheb sh4eb" 24PACKAGE_EXTRA_ARCHS:tune-sh4eb = "sheb sh4eb"
25 25
26TUNE_FEATURES_tune-sh4a = "sh4a" 26TUNE_FEATURES:tune-sh4a = "sh4a"
27TUNE_ARCH_tune-sh4a = "sh4" 27TUNE_ARCH:tune-sh4a = "sh4"
28TUNE_PKGARCH_tune-sh4a = "sh4a" 28TUNE_PKGARCH:tune-sh4a = "sh4a"
29PACKAGE_EXTRA_ARCHS_tune-sh4a = "sh sh4 sh4a" 29PACKAGE_EXTRA_ARCHS:tune-sh4a = "sh sh4 sh4a"
30 30
31TUNE_FEATURES_tune-sh4aeb = "sh4a bigendian" 31TUNE_FEATURES:tune-sh4aeb = "sh4a bigendian"
32TUNE_ARCH_tune-sh4aeb = "sh4eb" 32TUNE_ARCH:tune-sh4aeb = "sh4eb"
33TUNE_PKGARCH_tune-sh4aeb = "sh4aeb" 33TUNE_PKGARCH:tune-sh4aeb = "sh4aeb"
34PACKAGE_EXTRA_ARCHS_tune-sh4aeb = "sheb sh4eb sh4aeb" 34PACKAGE_EXTRA_ARCHS:tune-sh4aeb = "sheb sh4eb sh4aeb"
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index 9479965843..6f5033bbc1 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -7,6 +7,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'strongarm', ' -mcpu=stron
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'strongarm', 'armv4:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'strongarm', 'armv4:', '', d)}"
8 8
9AVAILTUNES += "strongarm" 9AVAILTUNES += "strongarm"
10ARMPKGARCH_tune-strongarm = "strongarm" 10ARMPKGARCH:tune-strongarm = "strongarm"
11TUNE_FEATURES_tune-strongarm = "arm strongarm" 11TUNE_FEATURES:tune-strongarm = "arm strongarm"
12PACKAGE_EXTRA_ARCHS_tune-strongarm = "${PACKAGE_EXTRA_ARCHS_tune-armv4} strongarm" 12PACKAGE_EXTRA_ARCHS:tune-strongarm = "${PACKAGE_EXTRA_ARCHS:tune-armv4} strongarm"
diff --git a/meta/conf/machine/include/tune-thunderx.inc b/meta/conf/machine/include/tune-thunderx.inc
index d1aaf4891e..7bc6282be8 100644
--- a/meta/conf/machine/include/tune-thunderx.inc
+++ b/meta/conf/machine/include/tune-thunderx.inc
@@ -7,13 +7,13 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thunderx', ' -mcpu=thunde
7 7
8require conf/machine/include/arm/arch-armv8a.inc 8require conf/machine/include/arm/arch-armv8a.inc
9 9
10ARMPKGARCH_tune-thunderx ?= "thunderx" 10ARMPKGARCH:tune-thunderx ?= "thunderx"
11ARMPKGARCH_tune-thunderx_be ?= "thunderx" 11ARMPKGARCH:tune-thunderx_be ?= "thunderx"
12 12
13TUNE_FEATURES_tune-thunderx = "${TUNE_FEATURES_tune-aarch64} thunderx" 13TUNE_FEATURES:tune-thunderx = "${TUNE_FEATURES:tune-aarch64} thunderx"
14TUNE_FEATURES_tune-thunderx_be = "${TUNE_FEATURES_tune-thunderx} bigendian" 14TUNE_FEATURES:tune-thunderx_be = "${TUNE_FEATURES:tune-thunderx} bigendian"
15BASE_LIB_tune-thunderx = "lib64" 15BASE_LIB:tune-thunderx = "lib64"
16BASE_LIB_tune-thunderx_be = "lib64" 16BASE_LIB:tune-thunderx_be = "lib64"
17 17
18PACKAGE_EXTRA_ARCHS_tune-thunderx = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} thunderx" 18PACKAGE_EXTRA_ARCHS:tune-thunderx = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} thunderx"
19PACKAGE_EXTRA_ARCHS_tune-thunderx_be = "aarch64_be thunderx_be" 19PACKAGE_EXTRA_ARCHS:tune-thunderx_be = "aarch64_be thunderx_be"
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index aeac365284..cc67dcd304 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -7,13 +7,13 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'xscale', ' -mcpu=xscale',
7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'xscale', 'armv5:', '', d)}" 7MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'xscale', 'armv5:', '', d)}"
8 8
9AVAILTUNES += "xscale" 9AVAILTUNES += "xscale"
10ARMPKGARCH_tune-xscale = "xscale" 10ARMPKGARCH:tune-xscale = "xscale"
11# mcpu is used so don't use armv5te as we don't want march 11# mcpu is used so don't use armv5te as we don't want march
12TUNE_FEATURES_tune-xscale = "arm thumb dsp xscale" 12TUNE_FEATURES:tune-xscale = "arm thumb dsp xscale"
13PACKAGE_EXTRA_ARCHS_tune-xscale = "${PACKAGE_EXTRA_ARCHS_tune-armv5te} xscale xscalet xscalee xscalete" 13PACKAGE_EXTRA_ARCHS:tune-xscale = "${PACKAGE_EXTRA_ARCHS:tune-armv5te} xscale xscalet xscalee xscalete"
14 14
15AVAILTUNES += "xscale-be" 15AVAILTUNES += "xscale-be"
16ARMPKGARCH_tune-xscale-be = "xscale" 16ARMPKGARCH:tune-xscale-be = "xscale"
17# mcpu is used so don't use armv5te as we don't want march 17# mcpu is used so don't use armv5te as we don't want march
18TUNE_FEATURES_tune-xscale-be = "${TUNE_FEATURES_tune-xscale} bigendian" 18TUNE_FEATURES:tune-xscale-be = "${TUNE_FEATURES:tune-xscale} bigendian"
19PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb} xscaleb xscaletb xscaleeb xscaleteb" 19PACKAGE_EXTRA_ARCHS:tune-xscale-be = "${PACKAGE_EXTRA_ARCHS:tune-armv5teb} xscaleb xscaletb xscaleeb xscaleteb"
diff --git a/meta/conf/machine/include/x86/README b/meta/conf/machine/include/x86/README
index 2b6c46c7eb..05aee533a7 100644
--- a/meta/conf/machine/include/x86/README
+++ b/meta/conf/machine/include/x86/README
@@ -14,7 +14,7 @@ X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH.
14 14
15The TUNE_PKGARCH is defined as follows: 15The TUNE_PKGARCH is defined as follows:
16 16
17TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} 17TUNE_PKGARCH = ${TUNE_PKGARCH:tune-${DEFAULTTUNE}}
18 18
19The package architecture for 32-bit targets is historical and generally 19The package architecture for 32-bit targets is historical and generally
20set to to match the core compatible processor type, i.e. i386. 20set to to match the core compatible processor type, i.e. i386.
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc
index 2edb360b7d..28742e794d 100644
--- a/meta/conf/machine/include/x86/arch-x86.inc
+++ b/meta/conf/machine/include/x86/arch-x86.inc
@@ -7,7 +7,7 @@ TARGET_FPU ?= ""
7X86ARCH32 ?= "i586" 7X86ARCH32 ?= "i586"
8X86ARCH64 ?= "x86_64" 8X86ARCH64 ?= "x86_64"
9 9
10TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 10TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
11 11
12# ELF32 ABI 12# ELF32 ABI
13TUNEVALID[m32] = "IA32 ELF32 standard ABI" 13TUNEVALID[m32] = "IA32 ELF32 standard ABI"
@@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}"
25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" 25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}"
26TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" 26TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}"
27# user mode qemu doesn't support x32 27# user mode qemu doesn't support x32
28MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" 28MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}"
29MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}" 29MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}"
30 30
31# ELF64 ABI 31# ELF64 ABI
@@ -36,19 +36,19 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}"
36 36
37# Default Tune configurations 37# Default Tune configurations
38AVAILTUNES += "x86" 38AVAILTUNES += "x86"
39TUNE_FEATURES_tune-x86 = "m32" 39TUNE_FEATURES:tune-x86 = "m32"
40BASE_LIB_tune-x86 = "lib" 40BASE_LIB:tune-x86 = "lib"
41TUNE_PKGARCH_tune-x86 = "x86" 41TUNE_PKGARCH:tune-x86 = "x86"
42PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" 42PACKAGE_EXTRA_ARCHS:tune-x86 = "${TUNE_PKGARCH:tune-x86}"
43 43
44AVAILTUNES += "x86-64" 44AVAILTUNES += "x86-64"
45TUNE_FEATURES_tune-x86-64 = "m64" 45TUNE_FEATURES:tune-x86-64 = "m64"
46BASE_LIB_tune-x86-64 = "lib64" 46BASE_LIB:tune-x86-64 = "lib64"
47TUNE_PKGARCH_tune-x86-64 = "x86_64" 47TUNE_PKGARCH:tune-x86-64 = "x86_64"
48PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" 48PACKAGE_EXTRA_ARCHS:tune-x86-64 = "${TUNE_PKGARCH:tune-x86-64}"
49 49
50AVAILTUNES += "x86-64-x32" 50AVAILTUNES += "x86-64-x32"
51TUNE_FEATURES_tune-x86-64-x32 = "mx32" 51TUNE_FEATURES:tune-x86-64-x32 = "mx32"
52BASE_LIB_tune-x86-64-x32 = "libx32" 52BASE_LIB:tune-x86-64-x32 = "libx32"
53TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" 53TUNE_PKGARCH:tune-x86-64-x32 = "x86_64_x32"
54PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" 54PACKAGE_EXTRA_ARCHS:tune-x86-64-x32 = "${TUNE_PKGARCH:tune-x86-64-x32}"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 34fcde698c..f893f1a76a 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
9 9
10UBOOT_MACHINE ?= "qemu_arm_defconfig" 10UBOOT_MACHINE ?= "qemu:arm_defconfig"
11 11
12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" 12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -31,4 +31,4 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio
31QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" 31QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
32QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" 32QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
33 33
34KMACHINE_qemuarm = "qemuarma15" 34KMACHINE:qemuarm = "qemuarma15"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 150a0744eb..3dcb0d1b1e 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
9 9
10UBOOT_MACHINE ?= "qemu_arm64_defconfig" 10UBOOT_MACHINE ?= "qemu:arm64_defconfig"
11 11
12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" 12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 7050bae088..7650c2f4a2 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -17,4 +17,4 @@ QB_OPT_APPEND = "-usb -device usb-tablet"
17PREFERRED_VERSION_linux-yocto ??= "5.10%" 17PREFERRED_VERSION_linux-yocto ??= "5.10%"
18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
19 19
20KMACHINE_qemuarmv5 = "qemuarm" 20KMACHINE:qemuarmv5 = "qemuarm"