diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_media.txt
index 597183fcc..36b04b269 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_media.txt
@@ -173,7 +173,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -203,7 +203,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_media.txt
index 42c771a51..58c1830fb 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_media.txt
@@ -180,7 +180,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -210,7 +210,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_media.txt
index 7f6ea886b..807a52bc5 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_media.txt
@@ -174,7 +174,7 @@ setenv bootcmd "
 	else
 		force_erase=\"-e\";
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -204,7 +204,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_media.txt
index cdde62c74..ba4810e6b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_media.txt
@@ -149,7 +149,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -179,7 +179,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_media.txt
index 5fb16dbda..c0b48ea3b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_media.txt
@@ -160,7 +160,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -190,7 +190,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_media.txt
index 8667432f6..571592da4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_media.txt
@@ -183,7 +183,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -213,7 +213,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_media.txt
index b22e9dbf4..85b68f4f7 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_media.txt
@@ -191,7 +191,7 @@ setenv bootcmd "
 	setenv rootfstype ${rootfstype};
 	setenv install_dualboot ${install_dualboot};
 	run ubivolscript;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -221,7 +221,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_media.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_media.txt
index b05dda55f..281586866 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_media.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_media.txt
@@ -198,7 +198,7 @@ setenv bootcmd "
 		echo \"Aborted.\";
 		exit;
 	fi;
-	if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+	if test "${INSTALL_MEDIA}" = "usb"; then
 		usb start;
 	fi;
 	if test \"\$\{dualboot\}\" = yes; then
@@ -228,7 +228,7 @@ setenv bootcmd "
 				exit;
 			fi;
 		fi;
-		if test  \"\$\{INSTALL_MEDIA\}\" = "usb"; then
+		if test "${INSTALL_MEDIA}" = "usb"; then
 			usb reset;
 		fi;
 		echo \"\";