From 825dd6a5553173b59d72912b1726db158e0a9453 Mon Sep 17 00:00:00 2001
From: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
Date: Wed, 29 Sep 2021 18:09:47 +0200
Subject: [PATCH] install_linux_fw_uuu: remove redirection in every case

Ensure stdout redirection to the USB interface is removed in every case.
Otherwise, it would be left redirected when INSTALL_UBOOT_FILENAME is
manually set.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
---
 .../u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh       | 9 ++++++---
 .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh  | 9 ++++++---
 .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh   | 9 ++++++---
 .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh    | 9 ++++++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
index 99eed2520..0f1b6a86f 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
@@ -105,13 +105,13 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 		INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##${module_ram}.imx"
 	fi
 
-	# remove redirect
-	uuu fb: ucmd setenv stdout serial
-
 	# U-Boot when the checked value is empty.
 	if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then
 		true
 	else
+		# remove redirect
+		uuu fb: ucmd setenv stdout serial
+
 		echo ""
 		echo "[ERROR] Cannot determine U-Boot file for this module!"
 		echo ""
@@ -130,6 +130,9 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	fi
 fi
 
+# remove redirect
+uuu fb: ucmd setenv stdout serial
+
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
index aa7b88467..ebc509a67 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
@@ -118,13 +118,13 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 		fi
 	fi
 
-	# remove redirect
-	uuu fb: ucmd setenv stdout serial
-
 	# U-Boot when the checked value is empty.
 	if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then
 		true
 	else
+		# remove redirect
+		uuu fb: ucmd setenv stdout serial
+
 		echo ""
 		echo "[ERROR] Cannot determine U-Boot file for this module!"
 		echo ""
@@ -148,6 +148,9 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	fi
 fi
 
+# remove redirect
+uuu fb: ucmd setenv stdout serial
+
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
index ca8305836..8e664d657 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
@@ -123,13 +123,13 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
 		fi
 	fi
 
-	# remove redirect
-	uuu fb: ucmd setenv stdout serial
-
 	# U-Boot when the checked value is empty.
 	if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then
 		true
 	else
+		# remove redirect
+		uuu fb: ucmd setenv stdout serial
+
 		echo ""
 		echo "[ERROR] Cannot determine U-Boot file for this module!"
 		echo ""
@@ -149,6 +149,9 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
 	fi
 fi
 
+# remove redirect
+uuu fb: ucmd setenv stdout serial
+
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh
index 8da80e9c5..bae55fc32 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh
@@ -127,13 +127,13 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 		INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin"
 	fi
 
-	# remove redirect
-	uuu fb: ucmd setenv stdout serial
-
 	# U-Boot when the checked value is empty.
 	if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then
 		true
 	else
+		# remove redirect
+		uuu fb: ucmd setenv stdout serial
+
 		echo ""
 		echo "[ERROR] Cannot determine U-Boot file for this module!"
 		echo ""
@@ -155,6 +155,9 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	fi
 fi
 
+# remove redirect
+uuu fb: ucmd setenv stdout serial
+
 # Determine linux, recovery, and rootfs image filenames to update
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="##DEFAULT_IMAGE_NAME##"