From 5ff8b186ce2960fc715ee5a6bd7651379d980494 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 31 May 2018 12:04:58 +0200
Subject: [PATCH] linux-dey: add support for ConnectCore 8X SBC Express

- This is an AARCH64 platform that requires to build "Image", so let's
  change KERNEL_IMAGETYPE to a weak assignment in imx-digi-base.inc
- The device tree is inside a vendor folder.
- For the moment, this platform builds from a different branch.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-5936
---
 meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf  | 2 +-
 meta-digi-arm/conf/machine/include/ccimx8x.inc       | 6 ++++++
 meta-digi-arm/conf/machine/include/imx-digi-base.inc | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb  | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
index bef141f5f..e4c266e6e 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -26,7 +26,7 @@ UBOOT_CONFIG ??= "ccimx8x_sbc_express"
 UBOOT_CONFIG[ccimx8x_sbc_express] = "ccimx8x_sbc_express_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 KERNEL_DEVICETREE ?= " \
-    ccimx8x-sbc-express.dtb \
+    digi/ccimx8x-sbc-express.dtb \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 2b2328908..df3df7608 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -12,6 +12,9 @@ include conf/machine/include/arm/arch-arm64.inc
 UBOOT_SUFFIX = "bin"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
 
+# Linux kernel configuration
+KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
+
 # Wireless external module
 WIRELESS_MODULE ?= ""
 
@@ -33,3 +36,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 "
 
 MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"
+
+# AARCH64 doesn't support compressed kernel images
+KERNEL_IMAGETYPE = "Image"
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 9a6f10b98..daa03ca60 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -106,7 +106,7 @@ PREFERRED_PROVIDER_virtual/libg2d_mx8 = "imx-dpu-g2d"
 
 EXTRA_IMAGEDEPENDS = "u-boot"
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE ?= "zImage"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
index 284d85696..3d8278481 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
@@ -3,6 +3,7 @@
 require recipes-kernel/linux/linux-dey.inc
 
 SRCBRANCH = "v4.9/dey-2.4/maint"
+SRCBRANCH_ccimx8x = "v4.9.51/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul|ccimx8x)"