From e508231683fdf3cc4fd472dd320536d875adaa6c Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 7 Feb 2019 11:32:23 +0100
Subject: [PATCH] thud migration: u-boot: remove kernel image type from device
 tree files

Device tree file names won't have the kernel image type like a
prefix anymore, since thud uses the original file names.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../u-boot/u-boot-dey/ccimx6qpsbc/boot.txt    |  6 ++--
 .../u-boot/u-boot-dey/ccimx6sbc/boot.txt      | 36 +++++++++----------
 .../u-boot/u-boot-dey/ccimx6ulsbc/boot.txt    |  8 ++---
 .../u-boot-dey/ccimx6ulstarter/boot.txt       |  8 ++---
 .../u-boot-dey/ccimx8x-sbc-express/boot.txt   | 14 ++++----
 .../u-boot-dey/ccimx8x-sbc-pro/boot.txt       |  8 ++---
 .../u-boot-dey/use-mainline-bsp/boot.txt      |  4 +--
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt
index 52b84adef..fcf0886e4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt
@@ -6,15 +6,15 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file zImage-${soc_family}-ccimx6qpsbc-id${board_id}.dtb
+	setenv fdt_file ${soc_family}-ccimx6qpsbc-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01"; then
-		setenv fdt_file zImage-${soc_family}-ccimx6qpsbc-wb.dtb
+		setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb
 	else
-		echo "------ Using default fdt_file"
+		setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb
 	fi
 fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt
index 192bce29c..422e9399c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt
@@ -6,45 +6,45 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file zImage-${soc_family}-ccimx6sbc-id${board_id}.dtb
+	setenv fdt_file ${soc_family}-ccimx6sbc-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x02"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x03"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x04"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x05"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-w.dtb
+		setenv fdt_file imx6q-ccimx6sbc-w.dtb
 	elif test "${module_variant}" = "0x06"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x08"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0a"; then
-		setenv fdt_file zImage-imx6dl-ccimx6sbc-w.dtb
+		setenv fdt_file imx6dl-ccimx6sbc-w.dtb
 	elif test "${module_variant}" = "0x0b"; then
-		setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6dl-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x0c"; then
-		setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb
+		setenv fdt_file imx6dl-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0e"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x0f"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x11"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x12"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x13"; then
-		setenv fdt_file zImage-imx6dl-ccimx6sbc-wb.dtb
+		setenv fdt_file imx6dl-ccimx6sbc-wb.dtb
 	elif test "${module_variant}" = "0x14"; then
-		setenv fdt_file zImage-imx6q-ccimx6sbc.dtb
+		setenv fdt_file imx6q-ccimx6sbc.dtb
 	elif test "${module_variant}" = "0x15"; then
-		setenv fdt_file zImage-imx6dl-ccimx6sbc.dtb
+		setenv fdt_file imx6dl-ccimx6sbc.dtb
 	else
-		echo "------ Using default fdt_file"
+		setenv fdt_file imx6q-ccimx6sbc-wb.dtb
 	fi
 fi
 
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 61ad40243..a63e46900 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
@@ -6,17 +6,17 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file zImage-imx6ul-ccimx6ulsbc-id${board_id}.dtb
+	setenv fdt_file imx6ul-ccimx6ulsbc-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
-		setenv fdt_file zImage-imx6ul-ccimx6ulsbc-wb.dtb
+		setenv fdt_file imx6ul-ccimx6ulsbc-wb.dtb
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
-		setenv fdt_file zImage-imx6ul-ccimx6ulsbc.dtb
+		setenv fdt_file imx6ul-ccimx6ulsbc.dtb
 	else
-		echo "------ Using default fdt_file: $fdt_file"
+		setenv fdt_file imx6ul-ccimx6ulsbc-wb.dtb
 	fi
 fi
 
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 cad47192a..b24e54ccd 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
@@ -6,17 +6,17 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file zImage-imx6ul-ccimx6ulstarter-id${board_id}.dtb
+	setenv fdt_file imx6ul-ccimx6ulstarter-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
-		setenv fdt_file zImage-imx6ul-ccimx6ulstarter-wb.dtb
+		setenv fdt_file imx6ul-ccimx6ulstarter-wb.dtb
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
-		setenv fdt_file zImage-imx6ul-ccimx6ulstarter.dtb
+		setenv fdt_file imx6ul-ccimx6ulstarter.dtb
 	else
-		echo "------ Using default fdt_file: $fdt_file"
+		setenv fdt_file imx6ul-ccimx6ulstarter-wb.dtb
 	fi
 fi
 
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 e8895fadd..f64110f3e 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
@@ -6,23 +6,23 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file Image.gz-ccimx8x-sbc-express-id${board_id}.dtb
+	setenv fdt_file ccimx8x-sbc-express-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb
+		setenv fdt_file ccimx8x-sbc-express-wb.dtb
 	elif test "${module_variant}" = "0x02"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb
+		setenv fdt_file ccimx8x-sbc-express-wb.dtb
 	elif test "${module_variant}" = "0x03"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb
+		setenv fdt_file ccimx8x-sbc-express.dtb
 	elif test "${module_variant}" = "0x04"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-express-wb.dtb
+		setenv fdt_file ccimx8x-sbc-express-wb.dtb
 	elif test "${module_variant}" = "0x05"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-express.dtb
+		setenv fdt_file ccimx8x-sbc-express.dtb
 	else
-		echo "------ Using default fdt_file"
+		setenv fdt_file ccimx8x-sbc-express-wb.dtb
 	fi
 fi
 
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 600880c48..d849048ee 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
@@ -6,17 +6,17 @@
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file Image.gz-ccimx8x-sbc-pro-id${board_id}.dtb
+	setenv fdt_file ccimx8x-sbc-pro-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-pro-wb.dtb
+		setenv fdt_file ccimx8x-sbc-pro-wb.dtb
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05"; then
-		setenv fdt_file Image.gz-ccimx8x-sbc-pro.dtb
+		setenv fdt_file ccimx8x-sbc-pro.dtb
 	else
-		echo "------ Using default fdt_file: $fdt_file"
+		setenv fdt_file ccimx8x-sbc-pro-wb.dtb
 	fi
 fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/use-mainline-bsp/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/use-mainline-bsp/boot.txt
index 8ad8e8c96..8459308b7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/use-mainline-bsp/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/use-mainline-bsp/boot.txt
@@ -2,9 +2,9 @@
 # U-Boot bootscript for NAND images created by Yocto.
 #
 if test "${board}" = "ccimx6ulsbc"; then
-	setenv fdt_file zImage-imx6ul-ccimx6ulsbcpro.dtb
+	setenv fdt_file imx6ul-ccimx6ulsbcpro.dtb
 else
-	setenv fdt_file zImage-imx6ul-ccimx6ulsbcexpress.dtb
+	setenv fdt_file imx6ul-ccimx6ulsbcexpress.dtb
 fi
 
 if test "${mtdbootpart}" = "recovery"; then