From 263818846f535cff70bd950008747ecfba8c948c Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 11 Apr 2019 16:42:59 +0200
Subject: [PATCH] u-boot-dey: add support for new ccimx6ul variant 0x06

This variant is exactly the same as variant 0x02, but with a new revision
of the i.MX6UL silicon.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt          | 2 +-
 .../u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt       | 2 +-
 .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt      | 2 +-
 .../u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
index a63e46900..dcd797ba7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
@@ -11,7 +11,7 @@ else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
-	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
+	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x06"; then
 		setenv fdt_file imx6ul-ccimx6ulsbc-wb.dtb
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
 		setenv fdt_file imx6ul-ccimx6ulsbc.dtb
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt
index 2a63489e5..3ecb9ed69 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt
@@ -21,7 +21,7 @@ fi
 
 # Determine U-Boot file to program basing on module variant
 if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then
+	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06"; then
 		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc.imx;
 	elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then
 		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc1GB.imx;
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
index b24e54ccd..0200b0d50 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
@@ -11,7 +11,7 @@ else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
-	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
+	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x06"; then
 		setenv fdt_file imx6ul-ccimx6ulstarter-wb.dtb
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
 		setenv fdt_file imx6ul-ccimx6ulstarter.dtb
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt
index b9d1c97c2..1788b9904 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt
@@ -21,7 +21,7 @@ fi
 
 # Determine U-Boot file to program basing on module variant
 if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then
+	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06"; then
 		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx;
 	elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then
 		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter1GB.imx;