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 f0788f882..aee6549cc 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
@@ -40,7 +40,7 @@ show_usage()
 	exit 2
 }
 
-# Update a NAND partition
+# Update a partition
 #   Params:
 #	1. partition
 #	2. file
@@ -48,7 +48,7 @@ show_usage()
 #   Description:
 #	- downloads image to RAM
 #	- runs 'update' command from RAM
-nand_update()
+part_update()
 {
 	echo "\033[36m"
 	echo "====================================================================================="
@@ -165,7 +165,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-nand_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000
+part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000
 
 # Set 'bootcmd' for the second part of the script that will
 #  - Reset environment to defaults
@@ -195,13 +195,13 @@ sleep 3
 uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 
 # Update Linux
-nand_update "linux" "${INSTALL_LINUX_FILENAME}" 15000
+part_update "linux" "${INSTALL_LINUX_FILENAME}" 15000
 
 # Update Recovery
-nand_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000
 
 # Update Rootfs
-nand_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000
+part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000
 
 # Erase the 'Update' partition
 uuu fb: ucmd nand erase.part update
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 ca760a3d7..82499413f 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
@@ -40,7 +40,7 @@ show_usage()
 	exit 2
 }
 
-# Update a NAND partition
+# Update a partition
 #   Params:
 #	1. partition
 #	2. file
@@ -48,7 +48,7 @@ show_usage()
 #   Description:
 #	- downloads image to RAM
 #	- runs 'update' command from RAM
-nand_update()
+part_update()
 {
 	echo "\033[36m"
 	echo "====================================================================================="
@@ -165,7 +165,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-nand_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000
+part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000
 
 # Set 'bootcmd' for the second part of the script that will
 #  - Reset environment to defaults
@@ -195,13 +195,13 @@ sleep 3
 uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 
 # Update Linux
-nand_update "linux" "${INSTALL_LINUX_FILENAME}" 15000
+part_update "linux" "${INSTALL_LINUX_FILENAME}" 15000
 
 # Update Recovery
-nand_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000
 
 # Update Rootfs
-nand_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000
+part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000
 
 # Erase the 'Update' partition
 uuu fb: ucmd nand erase.part update
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 0f9435234..7125c04c0 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
@@ -40,6 +40,25 @@ show_usage()
 	exit 2
 }
 
+# Update a partition
+#   Params:
+#	1. partition
+#	2. file
+part_update()
+{
+	echo "\033[36m"
+	echo "====================================================================================="
+	echo "Updating '${1}' partition with file: ${2}"
+	echo "====================================================================================="
+	echo "\033[0m"
+
+	if [ "${1}" = "bootloader" ]; then
+		uuu fb: flash "${1}" "${2}"
+	else
+		uuu fb: flash -raw2sparse "${1}" "${2}"
+	fi
+}
+
 # Command line admits the following parameters:
 # -u <u-boot-filename>
 # -i <image-name>
@@ -100,7 +119,7 @@ done;
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-uuu fb: flash bootloader ${INSTALL_UBOOT_FILENAME}
+part_update "bootloader" "${INSTALL_UBOOT_FILENAME}"
 
 # Set MMC to boot from BOOT1 partition
 uuu fb: ucmd mmc partconf 0 1 1 1
@@ -143,13 +162,13 @@ uuu fb: acmd reset
 sleep 3
 
 # Update Linux
-uuu fb: flash -raw2sparse linux ${INSTALL_LINUX_FILENAME}
+part_update "linux" "${INSTALL_LINUX_FILENAME}"
 
 # Update Recovery
-uuu fb: flash -raw2sparse recovery ${INSTALL_RECOVERY_FILENAME}
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}"
 
 # Update Rootfs
-uuu fb: flash -raw2sparse rootfs ${INSTALL_ROOTFS_FILENAME}
+part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}"
 
 # Configure u-boot to boot into recovery mode
 uuu fb: ucmd setenv boot_recovery yes
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 2888d39be..8150e6c96 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
@@ -40,6 +40,25 @@ show_usage()
 	exit 2
 }
 
+# Update a partition
+#   Params:
+#	1. partition
+#	2. file
+part_update()
+{
+	echo "\033[36m"
+	echo "====================================================================================="
+	echo "Updating '${1}' partition with file: ${2}"
+	echo "====================================================================================="
+	echo "\033[0m"
+
+	if [ "${1}" = "bootloader" ]; then
+		uuu fb: flash "${1}" "${2}"
+	else
+		uuu fb: flash -raw2sparse "${1}" "${2}"
+	fi
+}
+
 # Command line admits the following parameters:
 # -u <u-boot-filename>
 # -i <image-name>
@@ -100,7 +119,7 @@ done;
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-uuu fb: flash bootloader ${INSTALL_UBOOT_FILENAME}
+part_update "bootloader" "${INSTALL_UBOOT_FILENAME}"
 
 # Set MMC to boot from BOOT1 partition
 uuu fb: ucmd mmc partconf 0 1 1 1
@@ -143,13 +162,13 @@ uuu fb: acmd reset
 sleep 3
 
 # Update Linux
-uuu fb: flash -raw2sparse linux ${INSTALL_LINUX_FILENAME}
+part_update "linux" "${INSTALL_LINUX_FILENAME}"
 
 # Update Recovery
-uuu fb: flash -raw2sparse recovery ${INSTALL_RECOVERY_FILENAME}
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}"
 
 # Update Rootfs
-uuu fb: flash -raw2sparse rootfs ${INSTALL_ROOTFS_FILENAME}
+part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}"
 
 # Configure u-boot to boot into recovery mode
 uuu fb: ucmd setenv boot_recovery yes
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 e5db22d39..372817adc 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
@@ -40,6 +40,25 @@ show_usage()
 	exit 2
 }
 
+# Update a partition
+#   Params:
+#	1. partition
+#	2. file
+part_update()
+{
+	echo "\033[36m"
+	echo "====================================================================================="
+	echo "Updating '${1}' partition with file: ${2}"
+	echo "====================================================================================="
+	echo "\033[0m"
+
+	if [ "${1}" = "bootloader" ]; then
+		uuu fb: flash "${1}" "${2}"
+	else
+		uuu fb: flash -raw2sparse "${1}" "${2}"
+	fi
+}
+
 # Command line admits the following parameters:
 # -u <u-boot-filename>
 # -i <image-name>
@@ -167,7 +186,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-uuu fb: flash bootloader ${INSTALL_UBOOT_FILENAME}
+part_update "bootloader" "${INSTALL_UBOOT_FILENAME}"
 
 # Set MMC to boot from BOOT1 partition
 uuu fb: ucmd mmc partconf 0 1 1 1
@@ -210,13 +229,13 @@ uuu fb: acmd reset
 sleep 3
 
 # Update Linux
-uuu fb: flash -raw2sparse linux ${INSTALL_LINUX_FILENAME}
+part_update "linux" "${INSTALL_LINUX_FILENAME}"
 
 # Update Recovery
-uuu fb: flash -raw2sparse recovery ${INSTALL_RECOVERY_FILENAME}
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}"
 
 # Update Rootfs
-uuu fb: flash -raw2sparse rootfs ${INSTALL_ROOTFS_FILENAME}
+part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}"
 
 # Configure u-boot to boot into recovery mode
 uuu fb: ucmd setenv boot_recovery yes
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 ba6ed6cf8..be6d3115e 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
@@ -40,6 +40,25 @@ show_usage()
 	exit 2
 }
 
+# Update a partition
+#   Params:
+#	1. partition
+#	2. file
+part_update()
+{
+	echo "\033[36m"
+	echo "====================================================================================="
+	echo "Updating '${1}' partition with file: ${2}"
+	echo "====================================================================================="
+	echo "\033[0m"
+
+	if [ "${1}" = "bootloader" ]; then
+		uuu fb: flash "${1}" "${2}"
+	else
+		uuu fb: flash -raw2sparse "${1}" "${2}"
+	fi
+}
+
 # Command line admits the following parameters:
 # -u <u-boot-filename>
 # -i <image-name>
@@ -167,7 +186,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr}
 uuu fb: ucmd setenv forced_update 1
 
 # Update U-Boot
-uuu fb: flash bootloader ${INSTALL_UBOOT_FILENAME}
+part_update "bootloader" "${INSTALL_UBOOT_FILENAME}"
 
 # Set MMC to boot from BOOT1 partition
 uuu fb: ucmd mmc partconf 0 1 1 1
@@ -210,10 +229,10 @@ uuu fb: acmd reset
 sleep 3
 
 # Update Linux
-uuu fb: flash -raw2sparse linux ${INSTALL_LINUX_FILENAME}
+part_update "linux" "${INSTALL_LINUX_FILENAME}"
 
 # Update Recovery
-uuu fb: flash -raw2sparse recovery ${INSTALL_RECOVERY_FILENAME}
+part_update "recovery" "${INSTALL_RECOVERY_FILENAME}"
 
 # Update Rootfs
 uuu fb: flash -raw2sparse rootfs ${INSTALL_ROOTFS_FILENAME}