summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-06-15 16:23:50 +0800
committerZhenhua Luo <zhenhua.luo@nxp.com>2016-06-23 10:58:13 +0800
commit38ec99d4f07a59966ba6808787322f58d5b4411a (patch)
treeb3757cd23ee4a3d99a8fa2c8c5d7134073b341b4
parent4c86e761452ad9d8557337701a8545c83c53f967 (diff)
downloadmeta-fsl-ppc-38ec99d4f07a59966ba6808787322f58d5b4411a.tar.gz
rename qoriq-base.inc to qoriq-ppc.inc
To align with qoriq-arm/qoriq-arm64 in future. Signed-off-by: Ting Liu <ting.liu@nxp.com>
-rw-r--r--conf/machine/include/e500mc.inc2
-rw-r--r--conf/machine/include/e500v2.inc2
-rw-r--r--conf/machine/include/e5500-64b.inc3
-rw-r--r--conf/machine/include/e5500.inc2
-rw-r--r--conf/machine/include/e6500-64b.inc3
-rw-r--r--conf/machine/include/e6500.inc3
-rw-r--r--conf/machine/include/qoriq-ppc.inc (renamed from conf/machine/include/qoriq-base.inc)0
7 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 9ce02d0..a33485b 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce500mc.inc 3require conf/machine/include/tune-ppce500mc.inc
4require conf/machine/include/qoriq-base.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 f56d35d..26ca9f0 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-base.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 db87836..72b958c 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
2DEFAULTTUNE ?= "ppc64e5500" 2DEFAULTTUNE ?= "ppc64e5500"
3 3
4require conf/machine/include/tune-ppce5500.inc 4require conf/machine/include/tune-ppce5500.inc
5require conf/machine/include/qoriq-base.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"
11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" 11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
12
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 2953ded..364ffac 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce5500.inc 3require conf/machine/include/tune-ppce5500.inc
4require conf/machine/include/qoriq-base.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 f3dcfa5..e0e04db 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
2DEFAULTTUNE ?= "ppc64e6500" 2DEFAULTTUNE ?= "ppc64e6500"
3 3
4require conf/machine/include/tune-ppce6500.inc 4require conf/machine/include/tune-ppce6500.inc
5require conf/machine/include/qoriq-base.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"
11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" 11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
12
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8974daa..8d773b6 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,7 +1,7 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce6500.inc 3require conf/machine/include/tune-ppce6500.inc
4require conf/machine/include/qoriq-base.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES =. "e6500:" 6MACHINEOVERRIDES =. "e6500:"
7 7
@@ -10,4 +10,3 @@ BUILD_64BIT_KERNEL = "1"
10require conf/multilib.conf 10require conf/multilib.conf
11MULTILIBS ?= "multilib:lib64" 11MULTILIBS ?= "multilib:lib64"
12DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" 12DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
13
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-ppc.inc
index 404a2d5..404a2d5 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-ppc.inc