adjust MACHINEOVERRIDES ordering

Change it from:
MACHINEOVERRIDES="e6500:qoriq:qoriq-ppc:b4:b4420:b4420qds"
to:
MACHINEOVERRIDES="qoriq:qoriq-ppc:e6500:b4:b4420:b4420qds"

Signed-off-by: Ting Liu <ting.liu@nxp.com>

7 files changed, 18 insertions, 8 deletions

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485b..2ef904e 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,8 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e500mc:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 26ca9f0..1abcacb 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,6 @@
 require conf/machine/include/tune-ppce500v2.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e500v2:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 72b958c..e493023 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,10 +2,12 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e5500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac..dc8abb1 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,8 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e5500:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index e0e04db..2c9a885 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,10 +2,12 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e6500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6..57ff8ed 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-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e6500:"
 
@@ -10,3 +10,5 @@ BUILD_64BIT_KERNEL = "1"
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib64"
 DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc
index cfcb5fa..5a3a333 100644
--- a/conf/machine/include/qoriq.inc
+++ b/conf/machine/include/qoriq.inc
@@ -1,7 +1,5 @@
 # Provides the QorIQ common settings
 
-require conf/machine/include/soc-family.inc
-
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"