[meta-freescale] [meta-fsl-ppc][PATCH] adjust MACHINEOVERRIDES ordering

b28495 at freescale.com b28495 at freescale.com
Wed Aug 12 01:51:09 PDT 2015


From: Ting Liu <ting.liu at freescale.com>

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 at 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(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 5871104..9ce02d0 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-base.inc
 
-MACHINEOVERRIDES .= ":e500mc"
+MACHINEOVERRIDES =. "e500mc:"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index a937254..f56d35d 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-base.inc
 
-MACHINEOVERRIDES .= ":e500v2"
+MACHINEOVERRIDES =. "e500v2:"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index d238ca8..db87836 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-base.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 88f6d06..2953ded 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-base.inc
 
-MACHINEOVERRIDES .= ":e5500"
+MACHINEOVERRIDES =. "e5500:"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 522ee71..f3dcfa5 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-base.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 4121fbe..8974daa 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-base.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 25d2297..3d1c250 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -12,7 +12,7 @@ PREFERRED_VERSION_openssl = "1.0.1i"
 # settings
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
-MACHINEOVERRIDES .= ":qoriq-ppc"
+MACHINEOVERRIDES =. "qoriq-ppc:"
 
 IMAGE_CLASSES += "image_types_uboot"
 EXTRA_IMAGEDEPENDS += "u-boot"
-- 
1.9.1



More information about the meta-freescale mailing list