qoriq-arm/qoriq-ppc: adjust MACHINEOVERRIDES

Adjust the order of qoriq/qoriq-arm/qoriq-ppc.
Old: e500mc:qoriq:p4080ds:qoriq-ppc
New: qoriq:qoriq-ppc:e500mc:p4080ds

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485beae4fed2dbb4d77791b4df3ff98d724df..ee1c2969734552a37e53bfcdba8cada03c383043 100644 (file)
--- 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-ppc.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 26ca9f04952c5ecd8232a957a873105e4e940696..420f0343bda957e77997ef46f7802a0a3aea6c11 100644 (file)
--- 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-ppc.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 72b958cdea0df8531caf8dbce2814702a14b9b3f..c515508e6969d44ed55f30c9c8c7e1a6cdaef243 100644 (file)
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,9 +2,9 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e5500-64b:"
+require conf/machine/include/qoriq-ppc.inc
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"

diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac43df8bda37abf8704348ffd88549e1323..f9050887d9746242ca0122983c6b9cceee5a2c19 100644 (file)
--- 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-ppc.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 e0e04dbc07c4bf132b1de93e6b2e18323048301a..33346d76d2c006cbe1676c89d3467a4fd35e8279 100644 (file)
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,9 +2,9 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500-64b:"
+require conf/machine/include/qoriq-ppc.inc
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"

diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6e404c27f8a6752529e1f48e766a97cf3c..b838c8d0b7f049d922dca7642c580ec1e4c9d4de 100644 (file)
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,9 +1,9 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500:"
+require conf/machine/include/qoriq-ppc.inc
 
 BUILD_64BIT_KERNEL = "1"
 

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index e6cf675baa4f8ce498298b7fb35866d990da48e4..d61db71b5951963a76e7c0fabdef6b2a2d3b12d4 100644 (file)
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/qoriq-base.inc
+# Provides the common settings for QorIQ ARM
 
 MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
 UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
@@ -6,4 +6,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-MACHINEOVERRIDES .= ":qoriq-arm"
+MACHINEOVERRIDES =. "qoriq-arm:"
+
+require conf/machine/include/qoriq-base.inc

diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index c60da4a47e76298a562ee61479cf861b2d825640..bd8d4d7941a5e79e2d9141c8b19d0691bb3debc1 100644 (file)
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/qoriq-base.inc
+# Provides the common settings for QorIQ PPC
 
 UBOOT_ENTRYPOINT = "0x80008000"
 
@@ -8,4 +8,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-MACHINEOVERRIDES .= ":qoriq-ppc"
+MACHINEOVERRIDES =. "qoriq-ppc:"
+
+require conf/machine/include/qoriq-base.inc