[oe-commits] Mark Hatle : tune-mips*: Ensure tunes are inherited in order

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ccacfd3460b47494f687c696ff985b7c1c6ca1cd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ccacfd3460b47494f687c696ff985b7c1c6ca1cd

Author: Mark Hatle <mark.hatle at windriver.com>
Date:   Wed Jul 30 20:16:26 2014 -0500

tune-mips*: Ensure tunes are inherited in order

Without this, you are not able to use mips32r2 on a mips64 based tune.

We want to be able to do a tri-lib system of mips64, mips64-n32 and mips32r2.

Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/conf/machine/include/tune-mips32r2.inc | 2 +-
 meta/conf/machine/include/tune-mips64.inc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/machine/include/tune-mips32r2.inc b/meta/conf/machine/include/tune-mips32r2.inc
index fb60592..c9deff8 100644
--- a/meta/conf/machine/include/tune-mips32r2.inc
+++ b/meta/conf/machine/include/tune-mips32r2.inc
@@ -1,6 +1,6 @@
 DEFAULTTUNE ?= "mips32r2"
 
-require conf/machine/include/mips/arch-mips.inc
+require conf/machine/include/tune-mips32.inc
 
 TUNEVALID[mips32r2] = "Enable mips32r2 specific processor optimizations"
 TUNECONFLICTS[mips32r2] = "n64 n32"
diff --git a/meta/conf/machine/include/tune-mips64.inc b/meta/conf/machine/include/tune-mips64.inc
index ba79e2b..9be0e0f 100644
--- a/meta/conf/machine/include/tune-mips64.inc
+++ b/meta/conf/machine/include/tune-mips64.inc
@@ -1,3 +1,3 @@
 DEFAULTTUNE ?= "mips64"
 
-require conf/machine/include/mips/arch-mips.inc
+require conf/machine/include/tune-mips32r2.inc