]> code.ossystems Code Review - meta-freescale.git/commitdiff
Code Review / meta-freescale.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b99b610)
multilib: use ?= to allow overridden in local.conf
authorTing Liu <ting.liu@freescale.com>
Fri, 9 Jan 2015 09:09:10 +0000 (17:09 +0800)
committerZhenhua Luo <zhenhua.luo@freescale.com>
Mon, 12 Jan 2015 08:56:16 +0000 (16:56 +0800)
The multilib setting was set in <core>.inc which was included by
the <machine>.conf. In bitbake.conf, <machine>.conf is included
after local.conf. Change to use ?= to not override the value in
local.conf.

This is useful when using external toolchain which does not need
to enable multilib.

Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
meta-fsl-ppc/conf/machine/include/e5500-64b.inc patch | blob | history
meta-fsl-ppc/conf/machine/include/e6500-64b.inc patch | blob | history
meta-fsl-ppc/conf/machine/include/e6500.inc patch | blob | history

diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
index 07e6274e210584391633a660b68ff9e085540a33..d238ca891cf03e5607f834de17d163d48ebf6b7c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
@@ -7,6 +7,6 @@ require conf/machine/include/qoriq-base.inc
 MACHINEOVERRIDES .= ":e5500-64b"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500"
+MULTILIBS ?= "multilib:lib32"
+DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
 
diff --git a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
index aa722a51351f591fd095dea30a4fbe32e169aa42..522ee71fe56e3b9ace6f0309a101119d2494a24c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
@@ -7,6 +7,6 @@ require conf/machine/include/qoriq-base.inc
 MACHINEOVERRIDES .= ":e6500-64b"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500"
+MULTILIBS ?= "multilib:lib32"
+DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
 
diff --git a/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc
index e6848bdcd0fbba9142127f1d21842747abbe9756..4121fbef9f48e87cc684e991f4467b483a661b76 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500.inc
@@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500"
 BUILD_64BIT_KERNEL = "1"
 
 require conf/multilib.conf
-MULTILIBS = "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500"
+MULTILIBS ?= "multilib:lib64"
+DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"