From bc7320f20381bcc31840b3ea36c530a4138a075f Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 25 May 2020 13:54:54 +0200
Subject: [PATCH] ccimx8x: add support for QXP overlay

Each platform now has only one base device tree, meant for the i.MX8DX variants
of the ccimx8x boards. Apply the QXP overlay in the bootscript if the SOC is
identified as an i.MX8QXP.

Since we want to give this overlay a higher priority than the SOM overlays
(wifi and bluetooth), prepend it to the overlay list after appending the SOM
overlays.

https://jira.digi.com/browse/DEL-7100

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf        | 3 ++-
 meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf            | 4 ++--
 .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt         | 7 ++++++-
 .../recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt | 7 ++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
index 2eb09ad94..e4aa15a34 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -12,8 +12,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot
 UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8qxp-sbc-express.dtb \
+    digi/ccimx8x-sbc-express.dtb \
     digi/ccimx8x_ov_bt.dtbo \
+    digi/ccimx8x_ov_qxp.dtbo \
     digi/ccimx8x_ov_wifi.dtbo \
 "
 
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
index 3d96de357..358bb6d4f 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
@@ -13,9 +13,9 @@ UBOOT_CONFIG[ccimx8x_sbc_pro1GB] = "ccimx8x_sbc_pro1GB_defconfig,,u-boot-dtb.${U
 UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8dx-sbc-pro.dtb \
-    digi/ccimx8qxp-sbc-pro.dtb \
+    digi/ccimx8x-sbc-pro.dtb \
     digi/ccimx8x_ov_bt.dtbo \
+    digi/ccimx8x_ov_qxp.dtbo \
     digi/ccimx8x_ov_wifi.dtbo \
     digi/ccimx8x-sbc-pro_ov_flexcan1.dtbo \
     digi/ccimx8x-sbc-pro_ov_lpuart3.dtbo \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
index a8e20191e..7aafcb8e9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
@@ -10,7 +10,7 @@ fi
 #
 # Set the base device tree filename
 #
-setenv fdt_file cc${soc_type}-sbc-express.dtb
+setenv fdt_file ccimx8x-sbc-express.dtb
 
 #
 # Set predetermined overlays for specific board IDs
@@ -45,6 +45,11 @@ else
 	fi
 fi
 
+# Apply QXP overlay if the SOC type is "imx8qxp"
+if test "${soc_type}" = "imx8qxp""; then
+	setenv overlays ccimx8x_ov_qxp.dtbo,${overlays}
+fi
+
 # Get the UUID of the configured boot partition.
 part uuid mmc ${mmcbootdev}:${mmcpart} bootpart
 # Check the boot source.
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
index 76d9047b5..073983d15 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
@@ -10,7 +10,7 @@ fi
 #
 # Set the base device tree filename
 #
-setenv fdt_file cc${soc_type}-sbc-pro.dtb
+setenv fdt_file ccimx8x-sbc-pro.dtb
 
 #
 # Set predetermined overlays for specific board IDs
@@ -45,6 +45,11 @@ else
 	fi
 fi
 
+# Apply QXP overlay if the SOC type is "imx8qxp"
+if test "${soc_type}" = "imx8qxp""; then
+	setenv overlays ccimx8x_ov_qxp.dtbo,${overlays}
+fi
+
 # Get the UUID of the configured boot partition.
 part uuid mmc ${mmcbootdev}:${mmcpart} bootpart
 # Check the boot source.