summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2015-08-12 16:51:09 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:20 -0300
commit7605f442b20e8fedd4ca513cb817c76ea19e05af (patch)
treee814b8b83e9cf86eb835ca4ec1ae734a469f8908 /conf/machine
parent7ea0a843d0f44801dc4def2063ecbecc09cda631 (diff)
downloadmeta-freescale-7605f442b20e8fedd4ca513cb817c76ea19e05af.tar.gz
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>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/e500mc.inc2
-rw-r--r--conf/machine/include/e500v2.inc2
-rw-r--r--conf/machine/include/e5500-64b.inc2
-rw-r--r--conf/machine/include/e5500.inc2
-rw-r--r--conf/machine/include/e6500-64b.inc2
-rw-r--r--conf/machine/include/e6500.inc2
-rw-r--r--conf/machine/include/qoriq-base.inc2
7 files changed, 7 insertions, 7 deletions
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"
3require conf/machine/include/tune-ppce500mc.inc 3require conf/machine/include/tune-ppce500mc.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES .= ":e500mc" 6MACHINEOVERRIDES =. "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 @@
1require conf/machine/include/tune-ppce500v2.inc 1require conf/machine/include/tune-ppce500v2.inc
2require conf/machine/include/qoriq-ppc.inc 2require conf/machine/include/qoriq-ppc.inc
3 3
4MACHINEOVERRIDES .= ":e500v2" 4MACHINEOVERRIDES =. "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"
4require conf/machine/include/tune-ppce5500.inc 4require conf/machine/include/tune-ppce5500.inc
5require conf/machine/include/qoriq-ppc.inc 5require conf/machine/include/qoriq-ppc.inc
6 6
7MACHINEOVERRIDES .= ":e5500-64b" 7MACHINEOVERRIDES =. "e5500-64b:"
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "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"
3require conf/machine/include/tune-ppce5500.inc 3require conf/machine/include/tune-ppce5500.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES .= ":e5500" 6MACHINEOVERRIDES =. "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"
4require conf/machine/include/tune-ppce6500.inc 4require conf/machine/include/tune-ppce6500.inc
5require conf/machine/include/qoriq-ppc.inc 5require conf/machine/include/qoriq-ppc.inc
6 6
7MACHINEOVERRIDES .= ":e6500-64b" 7MACHINEOVERRIDES =. "e6500-64b:"
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "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"
3require conf/machine/include/tune-ppce6500.inc 3require conf/machine/include/tune-ppce6500.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES .= ":e6500" 6MACHINEOVERRIDES =. "e6500:"
7 7
8BUILD_64BIT_KERNEL = "1" 8BUILD_64BIT_KERNEL = "1"
9 9
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"
24IPC_UST_SOC_bsc9132 = "B913x" 24IPC_UST_SOC_bsc9132 = "B913x"
25IPC_UST_SOC_b4 = "B4860" 25IPC_UST_SOC_b4 = "B4860"
26 26
27MACHINEOVERRIDES .= ":qoriq" 27MACHINEOVERRIDES =. "qoriq:"