From 6d586e3cba666c74a87f528d7ea7f18d0e82c3e7 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:31:23 +0800 Subject: 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 Signed-off-by: Otavio Salvador --- conf/machine/include/e500mc.inc | 2 +- conf/machine/include/e500v2.inc | 2 +- conf/machine/include/e5500-64b.inc | 2 +- conf/machine/include/e5500.inc | 2 +- conf/machine/include/e6500-64b.inc | 2 +- conf/machine/include/e6500.inc | 2 +- conf/machine/include/qoriq-arm.inc | 6 ++++-- conf/machine/include/qoriq-ppc.inc | 6 ++++-- 8 files changed, 14 insertions(+), 10 deletions(-) (limited to 'conf/machine/include') 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 @@ 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 26ca9f04..420f0343 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-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 72b958cd..c515508e 100644 --- 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 364ffac4..f9050887 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-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 e0e04dbc..33346d76 100644 --- 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 8d773b6e..b838c8d0 100644 --- 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 e6cf675b..d61db71b 100644 --- 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 c60da4a4..bd8d4d79 100644 --- 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 -- cgit v1.2.3-54-g00ecf