diff options
author | Ting Liu <ting.liu@freescale.com> | 2015-08-12 16:51:09 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-08-14 18:26:28 +0800 |
commit | 263701d424af172a770ddd1e3939ac0679599bfd (patch) | |
tree | 2fc77ba260b72db4213f7f87e4d47b06f040f352 | |
parent | 25747a7369043ee6402ac0a6f2b974cb9cf91f24 (diff) | |
download | meta-fsl-ppc-263701d424af172a770ddd1e3939ac0679599bfd.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>
-rw-r--r-- | conf/machine/include/e500mc.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e500v2.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e5500-64b.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e5500.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e6500-64b.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e6500.inc | 2 | ||||
-rw-r--r-- | 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" | |||
3 | require conf/machine/include/tune-ppce500mc.inc | 3 | require conf/machine/include/tune-ppce500mc.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e500mc" | 6 | 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 @@ | |||
1 | require conf/machine/include/tune-ppce500v2.inc | 1 | require conf/machine/include/tune-ppce500v2.inc |
2 | require conf/machine/include/qoriq-base.inc | 2 | require conf/machine/include/qoriq-base.inc |
3 | 3 | ||
4 | MACHINEOVERRIDES .= ":e500v2" | 4 | 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" | |||
4 | require conf/machine/include/tune-ppce5500.inc | 4 | require conf/machine/include/tune-ppce5500.inc |
5 | require conf/machine/include/qoriq-base.inc | 5 | require conf/machine/include/qoriq-base.inc |
6 | 6 | ||
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" |
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" | |||
3 | require conf/machine/include/tune-ppce5500.inc | 3 | require conf/machine/include/tune-ppce5500.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e5500" | 6 | 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" | |||
4 | require conf/machine/include/tune-ppce6500.inc | 4 | require conf/machine/include/tune-ppce6500.inc |
5 | require conf/machine/include/qoriq-base.inc | 5 | require conf/machine/include/qoriq-base.inc |
6 | 6 | ||
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" |
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" | |||
3 | require conf/machine/include/tune-ppce6500.inc | 3 | require conf/machine/include/tune-ppce6500.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e6500" | 6 | MACHINEOVERRIDES =. "e6500:" |
7 | 7 | ||
8 | BUILD_64BIT_KERNEL = "1" | 8 | BUILD_64BIT_KERNEL = "1" |
9 | 9 | ||
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" | |||
12 | # settings | 12 | # settings |
13 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | 13 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
14 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" | 14 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" |
15 | MACHINEOVERRIDES .= ":qoriq-ppc" | 15 | MACHINEOVERRIDES =. "qoriq-ppc:" |
16 | 16 | ||
17 | IMAGE_CLASSES += "image_types_uboot" | 17 | IMAGE_CLASSES += "image_types_uboot" |
18 | EXTRA_IMAGEDEPENDS += "u-boot" | 18 | EXTRA_IMAGEDEPENDS += "u-boot" |