summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@freescale.com>2015-08-12 22:42:15 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:15 -0300
commitcdbc38d16b48598d59d2b395ed465bc7b0226d82 (patch)
treea95343d53792963f3882ab23589d48636ca1050f
parenta761c4288f79e26a5c96b806d7ce575d4e0bb691 (diff)
downloadmeta-freescale-cdbc38d16b48598d59d2b395ed465bc7b0226d82.tar.gz
Replace qoriq-base.inc with qoriq-ppc.inc in qoriq tune files
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> Acked-by: Daiane Angolini <daiane.angolini@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-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
6 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 5871104d..f92ca412 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 a9372549..12c22a92 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 d238ca89..481e652c 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 88f6d06e..0f47c996 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 522ee71f..2e5a4839 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 4121fbef..b79f4aed 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