From 2eaade486fc7939570ba2fec0ca93aa461ff6cbe Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Fri, 24 Aug 2018 17:53:38 +0200
Subject: [PATCH] meta-digi-arm: ccimx6ul: Add support to build mainline BSP

Just add the following to the conf/local.conf file:

MACHINEOVERRIDES .= ":use-mainline-bsp"

The defconfig is the mainline imx_v6_v7_defconfig.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6ulsbc.conf          | 4 ++++
 meta-digi-arm/conf/machine/ccimx6ulstarter.conf      | 4 ++++
 meta-digi-arm/conf/machine/include/ccimx6ul.inc      | 3 ---
 meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 +
 meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb   | 8 ++++++++
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc     | 1 +
 6 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb

diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
index b52f6d5bc..ecf1f5cf2 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
@@ -26,6 +26,10 @@ KERNEL_DEVICETREE ?= " \
     imx6ul-ccimx6ulsbc-id135.dtb \
     imx6ul-ccimx6ulsbc-id136.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp ?= "imx6ul-ccimx6ulsbcpro.dtb"
+
+KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6ul_defconfig"
+KERNEL_DEFCONFIG_use-mainline-bsp ?= "arch/arm/configs/imx_v6_v7_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttymxc4"
 
diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
index 91b8f696f..10cb62a92 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -25,6 +25,10 @@ KERNEL_DEVICETREE ?= " \
     imx6ul-ccimx6ulstarter-wb.dtb \
     imx6ul-ccimx6ulstarter-id129.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp ?= "imx6ul-ccimx6ulsbcexpress.dtb"
+
+KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6ul_defconfig"
+KERNEL_DEFCONFIG_use-mainline-bsp ?= "arch/arm/configs/imx_v6_v7_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttymxc4"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index 962f2c2d9..498ad37d3 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -12,9 +12,6 @@ include conf/machine/include/tune-cortexa7.inc
 UBOOT_SUFFIX = "imx"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
 
-# Linux kernel configuration
-KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6ul_defconfig"
-
 # Wireless external module
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE_append = " ${@base_conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index f40341ab1..67f2081bf 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -3,6 +3,7 @@ PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
 PREFERRED_PROVIDER_u-boot ??= "u-boot-dey"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-dey"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-dey"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-4.18.y"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 #
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb b/meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb
new file mode 100644
index 000000000..ade04b657
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/linux/linux-4.18.y.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2018 Digi International
+
+require recipes-kernel/linux/linux-dey.inc
+
+SRCBRANCH = "v4.18.y"
+SRCREV = "${AUTOREV}"
+
+COMPATIBLE_MACHINE = "(ccimx6ul)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 58fc19e12..cf2de5982 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -3,6 +3,7 @@
 SUMMARY = "Linux kernel for Digi boards"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM_use-mainline-bsp = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "lzop-native bc-native"
 DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"