From 96bc57c7f0430d457f3f894d02bce9a5f4b690fc Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Fri, 28 May 2021 12:35:47 +0200
Subject: [PATCH] u-boot-dey: use global variables to generalize install
 scripts

Create global variables:
  DEFAULT_IMAGE_NAME
  GRAPHICAL_IMAGES

to have them substituted on the U-Boot install scripts for better
generalization.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6ulstarter.conf     |  3 +++
 .../conf/machine/include/digi-defaults.inc          |  6 ++++++
 meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc    | 13 +++++++------
 .../u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt  |  4 ++--
 .../u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt |  4 ++--
 .../u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt    |  4 ++--
 .../u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt   |  4 ++--
 .../u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt  | 10 +++-------
 .../u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt | 10 +++-------
 .../u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh  |  6 +++---
 .../ccimx6ulstarter/install_linux_fw_sd.txt         | 10 +++-------
 .../ccimx6ulstarter/install_linux_fw_usb.txt        | 10 +++-------
 .../ccimx6ulstarter/install_linux_fw_uuu.sh         |  6 +++---
 .../u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt |  4 ++--
 .../ccimx8mm-dvk/install_linux_fw_usb.txt           |  4 ++--
 .../u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh |  6 +++---
 .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt |  4 ++--
 .../ccimx8mn-dvk/install_linux_fw_usb.txt           |  4 ++--
 .../u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh |  6 +++---
 .../ccimx8x-sbc-express/install_linux_fw_sd.txt     |  4 ++--
 .../ccimx8x-sbc-express/install_linux_fw_usb.txt    |  4 ++--
 .../ccimx8x-sbc-express/install_linux_fw_uuu.sh     |  6 +++---
 .../ccimx8x-sbc-pro/install_linux_fw_sd.txt         |  4 ++--
 .../ccimx8x-sbc-pro/install_linux_fw_usb.txt        |  4 ++--
 .../ccimx8x-sbc-pro/install_linux_fw_uuu.sh         |  6 +++---
 25 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
index cee022c08..3bb83e1cb 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -40,3 +40,6 @@ BOOT_SCRIPTS = "boot.scr:boot.scr"
 
 # Flash image types
 IMAGE_FSTYPES ?= "tar.bz2 ubifs boot.ubifs recovery.ubifs"
+
+# Default image for install scripts
+DEFAULT_IMAGE_NAME ?= "core-image-base"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 401586d45..0c21fa198 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -73,3 +73,9 @@ MACHINE_EXTRA_RDEPENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     ${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \
 "
+
+# Default image name (for install scripts)
+DEFAULT_IMAGE_NAME ??= "dey-image-qt"
+
+# List of graphical images names (for install scripts)
+GRAPHICAL_IMAGES ?= "dey-image-qt dey-image-webkit"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index e1b682c74..3732e1caa 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -164,19 +164,20 @@ do_deploy_append() {
 		unset  i
 	fi
 
-	# DEY firmware install script
-	sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt
-	sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_sd.txt
+	# DEY firmware install scripts
+	sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt ${WORKDIR}/install_linux_fw_usb.txt
+	sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_sd.txt  ${WORKDIR}/install_linux_fw_usb.txt
+	sed -i -e 's,##GRAPHICAL_IMAGES##,${GRAPHICAL_IMAGES},g' ${WORKDIR}/install_linux_fw_sd.txt  ${WORKDIR}/install_linux_fw_usb.txt
+	sed -i -e 's,##DEFAULT_IMAGE_NAME##,${DEFAULT_IMAGE_NAME},g' ${WORKDIR}/install_linux_fw_sd.txt  ${WORKDIR}/install_linux_fw_usb.txt
 	mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr
-
-	sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_usb.txt
-	sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_usb.txt
 	mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_usb.txt ${DEPLOYDIR}/install_linux_fw_usb.scr
 
 	if [ "${@oe.utils.conditional('UBOOT_HAS_FASTBOOT', 'true', 'true', '', d)}" = "true" ]; then
 		# DEY firmware install uuu script
 		sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_uuu.sh
 		sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_uuu.sh
+		sed -i -e 's,##GRAPHICAL_IMAGES##,${GRAPHICAL_IMAGES},g' ${WORKDIR}/install_linux_fw_uuu.sh
+		sed -i -e 's,##DEFAULT_IMAGE_NAME##,${DEFAULT_IMAGE_NAME},g' ${WORKDIR}/install_linux_fw_uuu.sh
 		install -m 775 ${WORKDIR}/install_linux_fw_uuu.sh ${DEPLOYDIR}/
 	fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt
index 655cb91f1..a9a61d06f 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt
@@ -52,9 +52,9 @@ fi;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt
index 38f29b7a8..7156078ea 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt
@@ -52,9 +52,9 @@ fi;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt
index e13490de5..46f9761c7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt
@@ -63,9 +63,9 @@ fi;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt
index ab3efa2c4..b0ac4fbd4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt
@@ -63,9 +63,9 @@ fi;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
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 67d2e40e4..115046ade 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
@@ -55,14 +55,10 @@ fi;
 
 setenv INSTALL_MMCDEV 0
 
-if test ! -n "${image-name}"; then
-	if test "${board_name}" == "ccimx6ulstarter"; then
-		setenv image-name core-image-base
-	else
-		setenv image-name dey-image-qt
-	fi
+if test -z "${image-name}"; then
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt
index fcd3e9ef7..21485e2e3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt
@@ -55,14 +55,10 @@ fi;
 
 setenv INSTALL_USBDEV 0
 
-if test ! -n "${image-name}"; then
-	if test "${board_name}" == "ccimx6ulstarter"; then
-		setenv image-name core-image-base
-	else
-		setenv image-name dey-image-qt
-	fi
+if test -z "${image-name}"; then
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
index 46f6ac0d8..c6971b7b0 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'dey-image-qt' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -128,9 +128,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="dey-image-qt"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
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 67d2e40e4..115046ade 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
@@ -55,14 +55,10 @@ fi;
 
 setenv INSTALL_MMCDEV 0
 
-if test ! -n "${image-name}"; then
-	if test "${board_name}" == "ccimx6ulstarter"; then
-		setenv image-name core-image-base
-	else
-		setenv image-name dey-image-qt
-	fi
+if test -z "${image-name}"; then
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt
index 536d7e425..3f8cec07b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt
@@ -55,14 +55,10 @@ fi;
 
 setenv INSTALL_USBDEV 0
 
-if test ! -n "${image-name}"; then
-	if test "${board_name}" == "ccimx6ulstarter"; then
-		setenv image-name core-image-base
-	else
-		setenv image-name dey-image-qt
-	fi
+if test -z "${image-name}"; then
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
index d397f8c18..c6971b7b0 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'core-image-base' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -128,9 +128,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="core-image-base"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt
index 167452ddd..ddb57af6c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt
@@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt
index 63721cb8a..ec72bb8d0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt
@@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
index b0ae22c32..48ecd611a 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'dey-image-qt' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -86,9 +86,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="dey-image-qt"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt
index 167452ddd..ddb57af6c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt
@@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt
index 63721cb8a..ec72bb8d0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt
@@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
index b0ae22c32..48ecd611a 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'dey-image-qt' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -86,9 +86,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="dey-image-qt"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
index 7d1a0d9ec..f811db5d7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt
@@ -94,9 +94,9 @@ fi;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt
index 4e91ebdef..18f1439de 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt
@@ -92,9 +92,9 @@ fi;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
index 44158f3ab..88eed85b3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'dey-image-qt' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -148,9 +148,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="dey-image-qt"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
index 7d1a0d9ec..f811db5d7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt
@@ -94,9 +94,9 @@ fi;
 setenv INSTALL_MMCDEV 1
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt
index 946883963..3ab0e0041 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt
@@ -94,9 +94,9 @@ fi;
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
-	setenv image-name dey-image-qt
+	setenv image-name ##DEFAULT_IMAGE_NAME##
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if test "${image-name}" = "${g}"; then
 		BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
index 44158f3ab..88eed85b3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
@@ -32,7 +32,7 @@ show_usage()
 	echo "   -h                     Show this help."
 	echo "   -i <dey-image-name>    Image name that prefixes the image filenames, such as 'dey-image-qt', "
 	echo "                          'dey-image-webkit', 'core-image-base'..."
-	echo "                          Defaults to 'dey-image-qt' if not provided."
+	echo "                          Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
 	echo "   -n                     No wait. Skips 10 seconds delay to stop script."
 	echo "   -u <u-boot-filename>   U-Boot filename."
 	echo "                          Auto-determined by variant if not provided."
@@ -148,9 +148,9 @@ fi
 
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
-	IMAGE_NAME="dey-image-qt"
+	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
 fi
-GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
 for g in ${GRAPHICAL_IMAGES}; do
 	if [ "${IMAGE_NAME}" = "${g}" ]; then
 		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"