summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-07-16 00:31:23 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-22 11:32:36 -0300
commit6d586e3cba666c74a87f528d7ea7f18d0e82c3e7 (patch)
tree39641f8285c9433463bbda3359ba763ff0b341ae /conf
parent0d7fab7da6307fd7397e4d8ac73dbf6396a537ea (diff)
downloadmeta-freescale-6d586e3cba666c74a87f528d7ea7f18d0e82c3e7.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/e500mc.inc2
-rw-r--r--conf/machine/include/e500v2.inc2
-rw-r--r--conf/machine/include/e5500-64b.inc2
-rw-r--r--conf/machine/include/e5500.inc2
-rw-r--r--conf/machine/include/e6500-64b.inc2
-rw-r--r--conf/machine/include/e6500.inc2
-rw-r--r--conf/machine/include/qoriq-arm.inc6
-rw-r--r--conf/machine/include/qoriq-ppc.inc6
8 files changed, 14 insertions, 10 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485be..ee1c2969 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-ppc.inc
5 4
6MACHINEOVERRIDES =. "e500mc:" 5MACHINEOVERRIDES =. "e500mc:"
6require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 26ca9f04..420f0343 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-ppc.inc
3 2
4MACHINEOVERRIDES =. "e500v2:" 3MACHINEOVERRIDES =. "e500v2:"
4require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 72b958cd..c515508e 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,9 +2,9 @@ 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-ppc.inc
6 5
7MACHINEOVERRIDES =. "e5500-64b:" 6MACHINEOVERRIDES =. "e5500-64b:"
7require conf/machine/include/qoriq-ppc.inc
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac4..f9050887 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-ppc.inc
5 4
6MACHINEOVERRIDES =. "e5500:" 5MACHINEOVERRIDES =. "e5500:"
6require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index e0e04dbc..33346d76 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,9 +2,9 @@ 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-ppc.inc
6 5
7MACHINEOVERRIDES =. "e6500-64b:" 6MACHINEOVERRIDES =. "e6500-64b:"
7require conf/machine/include/qoriq-ppc.inc
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6e..b838c8d0 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,9 +1,9 @@
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-ppc.inc
5 4
6MACHINEOVERRIDES =. "e6500:" 5MACHINEOVERRIDES =. "e6500:"
6require conf/machine/include/qoriq-ppc.inc
7 7
8BUILD_64BIT_KERNEL = "1" 8BUILD_64BIT_KERNEL = "1"
9 9
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index e6cf675b..d61db71b 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,4 +1,4 @@
1require conf/machine/include/qoriq-base.inc 1# Provides the common settings for QorIQ ARM
2 2
3MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" 3MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
4UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" 4UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
@@ -6,4 +6,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
6SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" 6SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
7SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 7SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
8 8
9MACHINEOVERRIDES .= ":qoriq-arm" 9MACHINEOVERRIDES =. "qoriq-arm:"
10
11require conf/machine/include/qoriq-base.inc
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index c60da4a4..bd8d4d79 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,4 +1,4 @@
1require conf/machine/include/qoriq-base.inc 1# Provides the common settings for QorIQ PPC
2 2
3UBOOT_ENTRYPOINT = "0x80008000" 3UBOOT_ENTRYPOINT = "0x80008000"
4 4
@@ -8,4 +8,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
8SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" 8SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
9SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 9SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
10 10
11MACHINEOVERRIDES .= ":qoriq-ppc" 11MACHINEOVERRIDES =. "qoriq-ppc:"
12
13require conf/machine/include/qoriq-base.inc