From 0a0f376ea6c8898a220875fa487f0f4d19e17856 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 14 Oct 2020 16:04:37 +0200
Subject: [PATCH] ARM64: dts: ccimx8mn: add overlay for DVK version < 3

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

https://jira.digi.com/browse/DEL-7279
---
 meta-digi-arm/conf/machine/ccimx8mn-dvk.conf                 | 1 +
 .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt      | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 72e73a934..966cee45a 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -17,6 +17,7 @@ UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb"
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mn-dvk.dtb \
     digi/_ov_board_lvds_ccimx8mn-dvk.dtbo \
+    digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \
     digi/_ov_som_bt_ccimx8mn.dtbo \
     digi/_ov_som_mca-keypad_ccimx8mn.dtbo \
     digi/_ov_som_quad_ccimx8mn.dtbo \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
index b49f6a4df..413f0e3f5 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
@@ -42,6 +42,11 @@ if test "${soc_type}" = "imx8mn"; then
 	setenv overlays _ov_som_quad_ccimx8mn.dtbo,${overlays}
 fi
 
+# Apply DVK v1-v2 overlay if the board version is < 3
+if test "${board_version}" -lt "3"; then
+	setenv overlays _ov_board_v1-v2_ccimx8mn-dvk.dtbo,${overlays}
+fi
+
 # Get the UUID of the configured boot partition.
 part uuid mmc ${mmcbootdev}:${mmcpart} bootpart
 # Check the boot source.