From 514cd7fd80f6fe05e1bc09f5bb0977d13c2620c7 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Sat, 16 Oct 2021 17:24:02 +0200
Subject: [PATCH] Add support for shared kernel between IMX machines

BugzID: 75223
---
 conf/machine/imx8-nmhw23-dlm.conf |  2 +-
 conf/machine/imx8-nmhw23.conf     | 15 ++-------------
 conf/machine/include/imx8.inc     | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 conf/machine/include/imx8.inc

diff --git a/conf/machine/imx8-nmhw23-dlm.conf b/conf/machine/imx8-nmhw23-dlm.conf
index c554782..eb62a81 100644
--- a/conf/machine/imx8-nmhw23-dlm.conf
+++ b/conf/machine/imx8-nmhw23-dlm.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the netmodule HW23, DLM variant
 
 require imx8-nmhw23.conf
-KERNEL_DEVICETREE = "netmodule/imx8-nmhw23-dlm.dtb"
+KERNEL_DEVICETREE_TO_USE = "${HW23_DLM_DT}"
 MACHINEOVERRIDES .= ":imx8-nmhw23"
 SOTA_MACHINE = "imx8-nmhw23"
 
diff --git a/conf/machine/imx8-nmhw23.conf b/conf/machine/imx8-nmhw23.conf
index eb8d99b..6525207 100644
--- a/conf/machine/imx8-nmhw23.conf
+++ b/conf/machine/imx8-nmhw23.conf
@@ -1,30 +1,19 @@
 #@TYPE: Machine
 #@NAME: NetModule HW 23
 #@DESCRIPTION: Machine configuration for the nmhw23 mainboard
-
-require conf/machine/include/imx-base.inc
-# Prevent the use of imx mainline BSP
-IMX_DEFAULT_BSP = ""
-
-require conf/machine/include/tune-cortexa35.inc
-
-MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
+require include/imx8.inc
 
 IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot"
 IMAGE_CLASSES += "image_types"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 
-KERNEL_DEFCONFIG = "defconfig"
-KERNEL_DEVICETREE = "netmodule/imx8-nmhw23.dtb"
+KERNEL_DEVICETREE_TO_USE = "${HW23_DT}"
 
 SOTA_MACHINE = "${MACHINE}"
 
 KERNEL_CLASSES_append = " kernel-fitimage"
 
-KERNEL_IMAGETYPE = "Image"
-KERNEL_ALT_IMAGETYPE = "Image"
-UBOOT_ENTRYPOINT = "0x80280000"
 #UBOOT_MACHINE = "imx8_nmhw23_defconfig"
 IMAGE_BOOT_FILES = "flash.bin"
 
diff --git a/conf/machine/include/imx8.inc b/conf/machine/include/imx8.inc
new file mode 100644
index 0000000..4144cb0
--- /dev/null
+++ b/conf/machine/include/imx8.inc
@@ -0,0 +1,21 @@
+require conf/machine/include/imx-base.inc
+require netmodule-hardware.inc
+
+# Prevent the use of imx mainline BSP
+IMX_DEFAULT_BSP = ""
+
+# Prevent usage of dynamic-packagearch for the kernel
+MACHINE_ARCH_FILTER = ""
+
+require conf/machine/include/tune-cortexa35.inc
+
+MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
+
+KERNEL_IMAGETYPE = "Image"
+KERNEL_ALT_IMAGETYPE = "Image"
+UBOOT_ENTRYPOINT = "0x80280000"
+KERNEL_DEFCONFIG = "imx8-netmodule_defconfig"
+
+HW23_DT = "netmodule/imx8-nmhw23.dtb"
+HW23_DLM_DT = "netmodule/imx8-nmhw23-dlm.dtb"
+KERNEL_DEVICETREE = "${HW23_DT} ${HW23_DLM_DT}"