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 b72f6d685..fa3fcf71f 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
@@ -8,13 +8,13 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on module variant
-if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx;
-	elif test "${module_variant}" = "0x03"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx;
+elif test "${module_variant}" = "0x03"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
 fi
+
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
 # u-boot when the checked value is empty.
 if test -n "${INSTALL_UBOOT_FILENAME}"; then
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 9cb620a30..6825d13bd 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
@@ -8,13 +8,13 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on module variant
-if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx;
-	elif test "${module_variant}" = "0x03"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx;
+elif test "${module_variant}" = "0x03"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
 fi
+
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
 # u-boot when the checked value is empty.
 if test -n "${INSTALL_UBOOT_FILENAME}"; then
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 eb59fb5ee..5a22ff55d 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
@@ -1,7 +1,7 @@
 #!/bin/sh
 #===============================================================================
 #
-#  Copyright (C) 2021-2023 by Digi International Inc.
+#  Copyright (C) 2021-2024 by Digi International Inc.
 #  All rights reserved.
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -100,13 +100,12 @@ echo "Determining image files to use..."
 if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	module_variant=$(getenv "module_variant")
 	# Determine U-Boot file to program basing on SOM's variant
-	if [ -n "$module_variant" ]; then
-		if [ "$module_variant" = "0x01" ] || \
-		   [ "$module_variant" = "0x02" ]; then
-			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx"
-		elif [ "$module_variant" = "0x03" ]; then
-			INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
-		fi
+	# If module_variant is unknown or not set, return error asking the user
+	if [ "$module_variant" = "0x01" ] || \
+	   [ "$module_variant" = "0x02" ]; then
+		INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx"
+	elif [ "$module_variant" = "0x03" ] || \
+		INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
 	fi
 
 	# U-Boot when the checked value is empty.
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 aeddcf636..b587cfe7f 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
@@ -8,19 +8,15 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on module variant
-if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x12"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx;
-	elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x16"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc.imx;
-	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc512MB.imx;
-	elif test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x15"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc.imx;
-	elif test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x13"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc512MB.imx;
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x12"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx;
+elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x15" || test "${module_variant}" = "0x16"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc.imx;
+elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f" || test "${module_variant}" = "0x13"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc512MB.imx;
 fi
+
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
 # u-boot when the checked value is empty.
 if test -n "${INSTALL_UBOOT_FILENAME}"; then
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 7edd7e4a5..367c7ae7c 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
@@ -8,19 +8,15 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on module variant
-if test -n "${module_variant}"; then
-	if test "${module_variant}" = "0x12"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx;
-	elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x16"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc.imx;
-	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc512MB.imx;
-	elif test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x15"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc.imx;
-	elif test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x13"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc512MB.imx;
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x12"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx;
+elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x15" || test "${module_variant}" = "0x16"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc.imx;
+elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f" || test "${module_variant}" = "0x13"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc512MB.imx;
 fi
+
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
 # u-boot when the checked value is empty.
 if test -n "${INSTALL_UBOOT_FILENAME}"; then
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 c7feaf45d..1b30133ff 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
@@ -1,7 +1,7 @@
 #!/bin/sh
 #===============================================================================
 #
-#  Copyright (C) 2021-2023 by Digi International Inc.
+#  Copyright (C) 2021-2024 by Digi International Inc.
 #  All rights reserved.
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -102,28 +102,23 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
 	if [ -n "$soc_family" ]; then
 		module_variant=$(getenv "module_variant")
 		# Determine U-Boot file to program basing on SOM's variant
-		if [ -n "$module_variant" ]; then
-			if [ "$module_variant" = "0x12" ]; then
-				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx"
-			elif [ "$module_variant" = "0x01" ] || \
-			     [ "$module_variant" = "0x02" ] || \
-			     [ "$module_variant" = "0x04" ] || \
-			     [ "$module_variant" = "0x05" ] || \
-			     [ "$module_variant" = "0x0b" ] || \
-			     [ "$module_variant" = "0x0d" ] || \
-			     [ "$module_variant" = "0x10" ] || \
-			     [ "$module_variant" = "0x11" ] || \
-			     [ "$module_variant" = "0x14" ] || \
-			     [ "$module_variant" = "0x15" ] || \
-			     [ "$module_variant" = "0x16" ]; then
-				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx"
-			elif [ "$module_variant" = "0x03" ] || \
-			     [ "$module_variant" = "0x0c" ] || \
-			     [ "$module_variant" = "0x0e" ] || \
-			     [ "$module_variant" = "0x0f" ] || \
-			     [ "$module_variant" = "0x13" ]; then
-				INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx"
-			fi
+		if [ "$module_variant" = "0x12" ]; then
+			INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx"
+		elif [ "$module_variant" = "0x02" ] || \
+		     [ "$module_variant" = "0x04" ] || \
+		     [ "$module_variant" = "0x05" ] || \
+		     [ "$module_variant" = "0x0b" ] || \
+		     [ "$module_variant" = "0x11" ] || \
+		     [ "$module_variant" = "0x14" ] || \
+		     [ "$module_variant" = "0x15" ] || \
+		     [ "$module_variant" = "0x16" ]; then
+			INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx"
+		elif [ "$module_variant" = "0x03" ] || \
+		     [ "$module_variant" = "0x0c" ] || \
+		     [ "$module_variant" = "0x0e" ] || \
+		     [ "$module_variant" = "0x0f" ] || \
+		     [ "$module_variant" = "0x13" ]; then
+			INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx"
 		fi
 	fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt
index b1f792351..b2486c79d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt
@@ -8,14 +8,13 @@ install_abort=0
 BASEFILENAME=0
 
 # 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" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx;
-	elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
-	elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx;
+elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
+elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx
 fi
 
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt
index 1e5350fad..440709c04 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt
@@ -8,14 +8,13 @@ install_abort=0
 BASEFILENAME=0
 
 # 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" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx;
-	elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
-	elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then
-		setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx
-	fi
+# If module_variant is unknown or not set, return error asking the user
+if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx;
+elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx;
+elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then
+	setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx
 fi
 
 # Use 'test -n ...' because 'test -z ...' does not work well on old versions of