summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>2016-11-08 17:12:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:52 +0000
commit3f1ec19b86f45dff125e3c2979a2e63eb8f22d84 (patch)
tree23a7c6a32ebd69664bf1225acb9455c8251e3af9 /meta/conf/machine
parent4caa6168b86e8d218ed982d0b76e37b4c21214a5 (diff)
downloadpoky-3f1ec19b86f45dff125e3c2979a2e63eb8f22d84.tar.gz
arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
In some cases, each MIPS variant in a recipe requires a duplicate line. Even if the passed flag is the same. Add global MACHINEOVERRIDES variables for the following * mipsarch : All MIPS * mipsarch{eb,el} : All MIPS Big/Little Endian * mipsarchr6 : All MIPS R6 * mipsarcho32 : All MIPS o32 Endian Independent * mipsarchn32 : All MIPS n32 Endian Independent * mipsarchn64 : All MIPS n64 Endian Independent * mipsarcho32{eb,el} : All MIPS o32 Big/Little Endian * mipsarchn32{eb,el} : All MIPS n32 Big/Little Endian * mipsarchn64{eb,el} : All MIPS n64 Big/Little Endian This is intended to reduce duplications in recipes [YOCTO #10404] (From OE-Core rev: 0d2205f26e5ece089630f72af2bd5f0931e851c3) Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/mips/README3
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc12
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/conf/machine/include/mips/README b/meta/conf/machine/include/mips/README
index 62fa1561ba..f36e87b45a 100644
--- a/meta/conf/machine/include/mips/README
+++ b/meta/conf/machine/include/mips/README
@@ -32,6 +32,9 @@ MIPSPKGSFX_BYTE - This is defined as either blank and "64" for MIPS64 CPUs.
32MIPSPKGSFX_ENDIAN - For bigendian hardware this is blank, otherwise it's 32MIPSPKGSFX_ENDIAN - For bigendian hardware this is blank, otherwise it's
33defined as "el". 33defined as "el".
34 34
35MIPSPKGSFX_ENDIAN2 - For bigendian hardware this is "eb", otherwise it's
36defined as "el".
37
35MIPSPKGSFX_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
36same value as TUNE_ARCH. In custom, optimized tunings, the value should 39same value as TUNE_ARCH. In custom, optimized tunings, the value should
37be modified to more precisely describe the tuning. 40be modified to more precisely describe the tuning.
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index 6069ca1ec0..d8b2bcb02d 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -39,6 +39,7 @@ TUNEVALID[mipsisa32r6] = "Use 32r6"
39 39
40# Package naming 40# Package naming
41MIPSPKGSFX_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el', d)}" 41MIPSPKGSFX_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el', d)}"
42MIPSPKGSFX_ENDIAN2 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'eb', 'el', d)}"
42MIPSPKGSFX_BYTE = "${@bb.utils.contains('TUNE_FEATURES', 'n64' , '64', '', d)}" 43MIPSPKGSFX_BYTE = "${@bb.utils.contains('TUNE_FEATURES', 'n64' , '64', '', d)}"
43MIPSPKGSFX_BYTE .= "${@bb.utils.contains('TUNE_FEATURES', 'n32' , '64', '', d)}" 44MIPSPKGSFX_BYTE .= "${@bb.utils.contains('TUNE_FEATURES', 'n32' , '64', '', d)}"
44MIPSPKGSFX_FPU = "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard' , '', '-nf', d)}" 45MIPSPKGSFX_FPU = "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard' , '', '-nf', d)}"
@@ -50,6 +51,17 @@ MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32',
50TUNE_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}"
51TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}" 52TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
52 53
54# Various Global Machine Overrides
55MACHINEOVERRIDES =. "mipsarch:"
56MACHINEOVERRIDES =. "mipsarch${MIPSPKGSFX_ENDIAN2}:"
57MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'r6', 'mipsarchr6:', '' ,d)}"
58MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'mipsarchn32:', '' ,d)}"
59MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32', 'mipsarcho32:', '' ,d)}"
60MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64:', '' ,d)}"
61MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'mipsarchn32${MIPSPKGSFX_ENDIAN2}:', '' ,d)}"
62MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32', 'mipsarcho32${MIPSPKGSFX_ENDIAN2}:', '' ,d)}"
63MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64${MIPSPKGSFX_ENDIAN2}:', '' ,d)}"
64
53# Base tunes 65# Base tunes
54AVAILTUNES += "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"
55TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard" 67TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard"