From 7635c1ffb81593d7401ee64b94b09e646a154800 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 20 Aug 2015 18:56:03 +0300 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-octeon.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta/conf/machine') 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" TUNEVALID[octeon2] = "Enable optimization related to octeon2 support" TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "octeon2", " -march=octeon2 ", "",d)}" + TUNE_FEATURES_tune-octeon2 = "${TUNE_FEATURES_tune-mips64-n32} octeon2" -MIPSPKGSFX_VARIANT_tune-octeon2 = "${TUNE_ARCH}" -PACKAGE_EXTRA_ARCHS_tune-octeon2 = "mips64-n32 octeon2 octeon2_64-n32" +MIPSPKGSFX_VARIANT_tune-octeon2 = "octeon2" +PACKAGE_EXTRA_ARCHS_tune-octeon2 = "mips64-n32 octeon2-n32" TUNE_FEATURES_tune-octeon2_64 = "${TUNE_FEATURES_tune-mips64} octeon2" -MIPSPKGSFX_VARIANT_tune-octeon2_64 = "${TUNE_ARCH}" +MIPSPKGSFX_VARIANT_tune-octeon2_64 = "octeon2_64" PACKAGE_EXTRA_ARCHS_tune-octeon2_64 = "mips64 octeon2_64" @@ -19,9 +20,9 @@ TUNEVALID[octeon3] = "Enable optimization related to octeon3 support" TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "octeon3", " -march=octeon3 ", "",d)}" TUNE_FEATURES_tune-octeon3 = "${TUNE_FEATURES_tune-mips64-n32} octeon3" -MIPSPKGSFX_VARIANT_tune-octeon3 = "${TUNE_ARCH}" -PACKAGE_EXTRA_ARCHS_tune-octeon3 = "mips64-n32 octeon3 octeon3_64-n32" +MIPSPKGSFX_VARIANT_tune-octeon3 = "octeon3" +PACKAGE_EXTRA_ARCHS_tune-octeon3 = "mips64-n32 octeon3-n32" TUNE_FEATURES_tune-octeon3_64 = "${TUNE_FEATURES_tune-mips64} octeon3" -MIPSPKGSFX_VARIANT_tune-octeon3_64 = "${TUNE_ARCH}" +MIPSPKGSFX_VARIANT_tune-octeon3_64 = "octeon3_64" PACKAGE_EXTRA_ARCHS_tune-octeon3_64 = "mips64 octeon3_64" -- cgit 1.2.3-korg