From 7605f442b20e8fedd4ca513cb817c76ea19e05af Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@freescale.com>
Date: Wed, 12 Aug 2015 16:51:09 +0800
Subject: adjust MACHINEOVERRIDES ordering

FILESPATH is in part built by using MACHINEOVERRIDES and the path
is built working right to left. Use =. instead of .= to prepend
(e6500-64b:qoriq-ppc) to (soc:board).

Take t2080rdb-64b as example, change from:
FILESOVERRIDES="powerpc64:t2:t2080:t2080rdb-64b:qoriq-ppc:e6500-64b:poky"
MACHINEOVERRIDES="t2:t2080:t2080rdb-64b:qoriq-ppc:e6500-64b"

To:
FILESOVERRIDES="powerpc64:e6500-64b:qoriq-ppc:t2:t2080:t2080rdb-64b:poky"
MACHINEOVERRIDES="e6500-64b:qoriq-ppc:t2:t2080:t2080rdb-64b"

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/include/e500mc.inc     | 2 +-
 conf/machine/include/e500v2.inc     | 2 +-
 conf/machine/include/e5500-64b.inc  | 2 +-
 conf/machine/include/e5500.inc      | 2 +-
 conf/machine/include/e6500-64b.inc  | 2 +-
 conf/machine/include/e6500.inc      | 2 +-
 conf/machine/include/qoriq-base.inc | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'conf')

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index f92ca412..a33485be 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce500mc.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e500mc"
+MACHINEOVERRIDES =. "e500mc:"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 12c22a92..26ca9f04 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e500v2"
+MACHINEOVERRIDES =. "e500v2:"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 481e652c..72b958cd 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -4,7 +4,7 @@ DEFAULTTUNE ?= "ppc64e5500"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e5500-64b"
+MACHINEOVERRIDES =. "e5500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 0f47c996..364ffac4 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e5500"
+MACHINEOVERRIDES =. "e5500:"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 2e5a4839..e0e04dbc 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -4,7 +4,7 @@ DEFAULTTUNE ?= "ppc64e6500"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e6500-64b"
+MACHINEOVERRIDES =. "e6500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index b79f4aed..8d773b6e 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-ppc.inc
 
-MACHINEOVERRIDES .= ":e6500"
+MACHINEOVERRIDES =. "e6500:"
 
 BUILD_64BIT_KERNEL = "1"
 
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index f85f18e1..8b2b0c7d 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -24,4 +24,4 @@ IPC_UST_SOC_bsc9131 = "B913x"
 IPC_UST_SOC_bsc9132 = "B913x"
 IPC_UST_SOC_b4 = "B4860"
 
-MACHINEOVERRIDES .= ":qoriq"
+MACHINEOVERRIDES =. "qoriq:"
-- 
cgit v1.2.3-54-g00ecf