6 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 5871104dc..f92ca4125 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce500mc.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e500mc"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index a93725494..12c22a925 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e500v2"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index d238ca891..481e652cd 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e5500-64b"
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 88f6d06e2..0f47c996a 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e5500"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 522ee71fe..2e5a48395 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e6500-64b"
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 4121fbef9..b79f4aede 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,7 +1,7 @@
 TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-base.inc
+require conf/machine/include/qoriq-ppc.inc
 MACHINEOVERRIDES .= ":e6500"
@@ -10,4 +10,3 @@ BUILD_64BIT_KERNEL = "1"
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib64"
 DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc index 5871104dc..f92ca4125 100644 --- a/conf/machine/include/e500mc.inc +++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
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-ppc.inc
5		5
6	MACHINEOVERRIDES .= ":e500mc"	6	MACHINEOVERRIDES .= ":e500mc"


diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc index a93725494..12c22a925 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-ppc.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 d238ca891..481e652cd 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
2	DEFAULTTUNE ?= "ppc64e5500"	2	DEFAULTTUNE ?= "ppc64e5500"
3		3
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-ppc.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"
11	DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"	11	DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
12


diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc index 88f6d06e2..0f47c996a 100644 --- a/conf/machine/include/e5500.inc +++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
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-ppc.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 522ee71fe..2e5a48395 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc
@@ -2,11 +2,10 @@ TARGET_FPU = "hard"
2	DEFAULTTUNE ?= "ppc64e6500"	2	DEFAULTTUNE ?= "ppc64e6500"
3		3
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-ppc.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"
11	DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"	11	DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
12


diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 4121fbef9..b79f4aede 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc
@@ -1,7 +1,7 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
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-ppc.inc
5		5
6	MACHINEOVERRIDES .= ":e6500"	6	MACHINEOVERRIDES .= ":e6500"
7		7
@@ -10,4 +10,3 @@ BUILD_64BIT_KERNEL = "1"
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