From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 15 Jul 2016 16:31:26 +0000 (+0800)
Subject: qoriq-arm64.inc: add
X-Git-Tag: 2.2~380
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=922f847431ca21be2300a14ecaff514a7f3c9b81;p=meta-freescale.git

qoriq-arm64.inc: add

move KERNEL_IMAGETYPE setting from qoriq-base.inc as qoriq-arm64
has a different value.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index cc314925..eb03af43 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,5 +1,7 @@
 # Provides the common settings for QorIQ ARM
 
+KERNEL_IMAGETYPE ?= "uImage"
+
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc
new file mode 100644
index 00000000..e8d99a6e
--- /dev/null
+++ b/conf/machine/include/qoriq-arm64.inc
@@ -0,0 +1,10 @@
+# Provides the QorIQ common settings for ARM64
+
+KERNEL_IMAGETYPE ?= "Image"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+MACHINEOVERRIDES =. "qoriq-arm64:"
+
+require conf/machine/include/qoriq-base.inc
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index c5cbe299..f65eea3e 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -11,9 +11,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_qemu = "qemu-qoriq"
 
-# Define the default image type
 IMAGE_CLASSES ?= "image_types_uboot"
-KERNEL_IMAGETYPE ?= "uImage"
 
 MACHINE_FEATURES ?= "pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index 54ab6e30..b40e1489 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,5 +1,7 @@
 # Provides the common settings for QorIQ PPC
 
+KERNEL_IMAGETYPE ?= "uImage"
+
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"