summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-07-16 00:31:26 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-22 11:32:36 -0300
commit922f847431ca21be2300a14ecaff514a7f3c9b81 (patch)
tree060cf465d323c81847f032406b6a7328119502af /conf
parentf9cbcd440b8856d07d7bfd9d4a2df7c6a41fbc57 (diff)
downloadmeta-freescale-922f847431ca21be2300a14ecaff514a7f3c9b81.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/qoriq-arm.inc2
-rw-r--r--conf/machine/include/qoriq-arm64.inc10
-rw-r--r--conf/machine/include/qoriq-base.inc2
-rw-r--r--conf/machine/include/qoriq-ppc.inc2
4 files changed, 14 insertions, 2 deletions
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 @@
1# Provides the common settings for QorIQ ARM 1# Provides the common settings for QorIQ ARM
2 2
3KERNEL_IMAGETYPE ?= "uImage"
4
3SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" 5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
4SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
5 7
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 @@
1# Provides the QorIQ common settings for ARM64
2
3KERNEL_IMAGETYPE ?= "Image"
4
5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
7
8MACHINEOVERRIDES =. "qoriq-arm64:"
9
10require 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"
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" 11PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
12PREFERRED_PROVIDER_qemu = "qemu-qoriq" 12PREFERRED_PROVIDER_qemu = "qemu-qoriq"
13 13
14# Define the default image type
15IMAGE_CLASSES ?= "image_types_uboot" 14IMAGE_CLASSES ?= "image_types_uboot"
16KERNEL_IMAGETYPE ?= "uImage"
17 15
18MACHINE_FEATURES ?= "pci ext2 ext3 serial" 16MACHINE_FEATURES ?= "pci ext2 ext3 serial"
19MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq" 17MACHINE_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 @@
1# Provides the common settings for QorIQ PPC 1# Provides the common settings for QorIQ PPC
2 2
3KERNEL_IMAGETYPE ?= "uImage"
4
3SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" 5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
4SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
5 7