summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2015-08-20 18:56:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:48 +0100
commit7635c1ffb81593d7401ee64b94b09e646a154800 (patch)
treef97a733a17920ddc2cce343f58143d42d51f7a4e
parentb5b3085d9d6a351a1de86f95d5c8ba28dbfbddbb (diff)
downloadpoky-7635c1ffb81593d7401ee64b94b09e646a154800.tar.gz
tune-octeon.inc: correct packaging suffix
Octeon II/III binaries can contain instructions that are not compatible with MIPS64 processors. Thus Octeon II/III packages should go to separate directories. Set MIPSPKGSFX_VARIANT_tune-* to Octeon-specific values and update PACKAGE_EXTRA_ARCHS_tune-* accordingly. (From OE-Core rev: 69798449a8c1049728674dd352cf828063974cd0) (From OE-Core rev: 3f16f76868105aae7c82ae33831d3317903b58ac) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/tune-octeon.inc13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/conf/machine/include/tune-octeon.inc b/meta/conf/machine/include/tune-octeon.inc
index f80f97067f..fdd48b5a2c 100644
--- a/meta/conf/machine/include/tune-octeon.inc
+++ b/meta/conf/machine/include/tune-octeon.inc
@@ -6,12 +6,13 @@ AVAILTUNES += "octeon2 octeon2_64 octeon3 octeon3_64"
6 6
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
9TUNE_FEATURES_tune-octeon2 = "${TUNE_FEATURES_tune-mips64-n32} octeon2" 10TUNE_FEATURES_tune-octeon2 = "${TUNE_FEATURES_tune-mips64-n32} octeon2"
10MIPSPKGSFX_VARIANT_tune-octeon2 = "${TUNE_ARCH}" 11MIPSPKGSFX_VARIANT_tune-octeon2 = "octeon2"
11PACKAGE_EXTRA_ARCHS_tune-octeon2 = "mips64-n32 octeon2 octeon2_64-n32" 12PACKAGE_EXTRA_ARCHS_tune-octeon2 = "mips64-n32 octeon2-n32"
12 13
13TUNE_FEATURES_tune-octeon2_64 = "${TUNE_FEATURES_tune-mips64} octeon2" 14TUNE_FEATURES_tune-octeon2_64 = "${TUNE_FEATURES_tune-mips64} octeon2"
14MIPSPKGSFX_VARIANT_tune-octeon2_64 = "${TUNE_ARCH}" 15MIPSPKGSFX_VARIANT_tune-octeon2_64 = "octeon2_64"
15PACKAGE_EXTRA_ARCHS_tune-octeon2_64 = "mips64 octeon2_64" 16PACKAGE_EXTRA_ARCHS_tune-octeon2_64 = "mips64 octeon2_64"
16 17
17 18
@@ -19,9 +20,9 @@ TUNEVALID[octeon3] = "Enable optimization related to octeon3 support"
19TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "octeon3", " -march=octeon3 ", "",d)}" 20TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "octeon3", " -march=octeon3 ", "",d)}"
20 21
21TUNE_FEATURES_tune-octeon3 = "${TUNE_FEATURES_tune-mips64-n32} octeon3" 22TUNE_FEATURES_tune-octeon3 = "${TUNE_FEATURES_tune-mips64-n32} octeon3"
22MIPSPKGSFX_VARIANT_tune-octeon3 = "${TUNE_ARCH}" 23MIPSPKGSFX_VARIANT_tune-octeon3 = "octeon3"
23PACKAGE_EXTRA_ARCHS_tune-octeon3 = "mips64-n32 octeon3 octeon3_64-n32" 24PACKAGE_EXTRA_ARCHS_tune-octeon3 = "mips64-n32 octeon3-n32"
24 25
25TUNE_FEATURES_tune-octeon3_64 = "${TUNE_FEATURES_tune-mips64} octeon3" 26TUNE_FEATURES_tune-octeon3_64 = "${TUNE_FEATURES_tune-mips64} octeon3"
26MIPSPKGSFX_VARIANT_tune-octeon3_64 = "${TUNE_ARCH}" 27MIPSPKGSFX_VARIANT_tune-octeon3_64 = "octeon3_64"
27PACKAGE_EXTRA_ARCHS_tune-octeon3_64 = "mips64 octeon3_64" 28PACKAGE_EXTRA_ARCHS_tune-octeon3_64 = "mips64 octeon3_64"