diff options
| author | Ting Liu <ting.liu@freescale.com> | 2015-01-09 17:09:10 +0800 |
|---|---|---|
| committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-01-12 16:56:16 +0800 |
| commit | dc2e2ff97a6f8a83ac922c395f70d21eecc60fce (patch) | |
| tree | 13d40ea210780c6f7df0f75b344eb845aa7099bf | |
| parent | b99b6101764b8fc76fc4bcd309d00cb94a625b7b (diff) | |
| download | meta-freescale-dc2e2ff97a6f8a83ac922c395f70d21eecc60fce.tar.gz | |
multilib: use ?= to allow overridden in local.conf
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>
| -rw-r--r-- | meta-fsl-ppc/conf/machine/include/e5500-64b.inc | 4 | ||||
| -rw-r--r-- | meta-fsl-ppc/conf/machine/include/e6500-64b.inc | 4 | ||||
| -rw-r--r-- | meta-fsl-ppc/conf/machine/include/e6500.inc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc index 07e6274e..d238ca89 100644 --- 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 | |||
| 7 | MACHINEOVERRIDES .= ":e5500-64b" | 7 | MACHINEOVERRIDES .= ":e5500-64b" |
| 8 | 8 | ||
| 9 | require conf/multilib.conf | 9 | require conf/multilib.conf |
| 10 | MULTILIBS = "multilib:lib32" | 10 | MULTILIBS ?= "multilib:lib32" |
| 11 | DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500" | 11 | DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" |
| 12 | 12 | ||
diff --git a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc index aa722a51..522ee71f 100644 --- 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 | |||
| 7 | MACHINEOVERRIDES .= ":e6500-64b" | 7 | MACHINEOVERRIDES .= ":e6500-64b" |
| 8 | 8 | ||
| 9 | require conf/multilib.conf | 9 | require conf/multilib.conf |
| 10 | MULTILIBS = "multilib:lib32" | 10 | MULTILIBS ?= "multilib:lib32" |
| 11 | DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500" | 11 | DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" |
| 12 | 12 | ||
diff --git a/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc index e6848bdc..4121fbef 100644 --- a/meta-fsl-ppc/conf/machine/include/e6500.inc +++ b/meta-fsl-ppc/conf/machine/include/e6500.inc | |||
| @@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500" | |||
| 8 | BUILD_64BIT_KERNEL = "1" | 8 | BUILD_64BIT_KERNEL = "1" |
| 9 | 9 | ||
| 10 | require conf/multilib.conf | 10 | require conf/multilib.conf |
| 11 | MULTILIBS = "multilib:lib64" | 11 | MULTILIBS ?= "multilib:lib64" |
| 12 | DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500" | 12 | DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" |
| 13 | 13 | ||