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 b83524d0a..a44d894d4 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
@@ -53,7 +53,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -67,14 +66,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 1881db30e..57aa04d39 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
@@ -53,7 +53,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -67,14 +66,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 aa426b077..9d5e7a68e 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
@@ -60,7 +60,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -74,14 +73,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 ddc141d94..984df8e76 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
@@ -60,7 +60,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -74,14 +73,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 61b3bb892..d4cb888a4 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
@@ -56,7 +56,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -70,16 +69,17 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	else
-		setenv rootfstype squashfs
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+	setenv rootfstype;
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+	setenv rootfstype squashfs;
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 5d8b6e7ce..7b20779ea 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
@@ -56,7 +56,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -70,18 +69,17 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	else
-		setenv rootfstype squashfs
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+	setenv rootfstype;
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+	setenv rootfstype squashfs;
 else
-	setenv rootfstype
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
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 aed735e7b..b3c3f862d 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
@@ -202,7 +202,6 @@ if [ -z "${BASEFILENAME}" ]; then
 fi
 INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs"
 INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs"
-INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
 
 # Verify existence of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -217,16 +216,16 @@ for f in ${FILES}; do
 done;
 
 # Verify what kind of rootfs is going to be programmed
-if [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then
-	echo "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m"
-	INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.squashfs"
-	echo "\033[32m[INFO] Trying with file '${INSTALL_ROOTFS_FILENAME}'\033[0m"
-	if [ -f "${INSTALL_ROOTFS_FILENAME}" ]; then
-		SQUASHFS=true
-	else
-		echo "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m"
-		ABORT=true
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if [ -f "${ROOTFS_FILENAME}" ]; then
+	INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME}"
+elif [ -f "${ROOTFS_FILENAME_SQFS}" ]; then
+	INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME_SQFS}"
+	SQUASHFS=true
+else
+	printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n"
+	ABORT=true
 fi
 
 [ "${ABORT}" = true ] && exit 1
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt
index 466f98c81..4d2b76809 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt
@@ -24,7 +24,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -38,14 +37,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt
index 4635ae21c..338fc7fd8 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt
@@ -24,7 +24,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -38,14 +37,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt
index 4ff66b973..1c777d062 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt
@@ -36,7 +36,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -50,14 +49,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt
index f75804f65..9dd742845 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt
@@ -36,7 +36,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -50,14 +49,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
index 1ca68a2cd..a5ba55987 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
@@ -39,7 +39,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -53,14 +52,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
index 9fc05dd8c..5d1ac44d6 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
@@ -39,7 +39,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -53,14 +52,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
index feb94734e..d5c42709c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
@@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -40,16 +39,17 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	else
-		setenv rootfstype squashfs
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+	setenv rootfstype;
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+	setenv rootfstype squashfs;
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
index c491b64ee..3173db8f9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
@@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -40,18 +39,17 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	else
-		setenv rootfstype squashfs
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+	setenv rootfstype;
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+	setenv rootfstype squashfs;
 else
-	setenv rootfstype
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
index 031202e1e..4df790ea4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh
@@ -152,7 +152,6 @@ if [ -z "${BASEFILENAME}" ]; then
 fi
 INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs"
 INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs"
-INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
 
 # Verify existence of files before starting the update
 FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -167,16 +166,16 @@ for f in ${FILES}; do
 done;
 
 # Verify what kind of rootfs is going to be programmed
-if [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then
-	printf "\033[31m[ERROR] Could not find file '${INSTALL_ROOTFS_FILENAME}'\033[0m\n"
-	INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.squashfs"
-	printf "\033[32m[INFO] Trying with file '${INSTALL_ROOTFS_FILENAME}'\033[0m\n"
-	if [ -f "${INSTALL_ROOTFS_FILENAME}" ]; then
-		SQUASHFS=true
-	else
-		printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n"
-		ABORT=true
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if [ -f "${ROOTFS_FILENAME}" ]; then
+	INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME}"
+elif [ -f "${ROOTFS_FILENAME_SQFS}" ]; then
+	INSTALL_ROOTFS_FILENAME="${ROOTFS_FILENAME_SQFS}"
+	SQUASHFS=true
+else
+	printf "\033[31m[ERROR] Could not find any rootfs image\033[0m\n"
+	ABORT=true
 fi
 
 [ "${ABORT}" = true ] && exit 1
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
index 46b3df7fe..bc3c38c8a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
@@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the SD card
 FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -40,14 +39,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e mmc ${INSTALL_MMCDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
index ae5bd9ae7..32235698c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
@@ -26,7 +26,6 @@ if test "${BASEFILENAME}" = "0"; then
 fi
 setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat
 setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat
-setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4
 
 # Check for presence of firmware files on the USB
 FILES="${INSTALL_ATF_FILENAME} ${INSTALL_METADATA_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}"
@@ -40,14 +39,15 @@ for install_f in ${FILES}; do
 	fi;
 done
 # Verify what kind of rootfs is going to be programmed
-if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-	echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-	setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.squashfs
-	echo "INFO: Trying with file ${INSTALL_ROOTFS_FILENAME}";
-	if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then
-		echo "ERROR: Could not find file ${INSTALL_ROOTFS_FILENAME}";
-		install_abort=1;
-	fi
+ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4"
+ROOTFS_FILENAME_SQFS="${BASEFILENAME}-##MACHINE##.squashfs"
+if test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME};
+elif test -e usb ${INSTALL_USBDEV} ${ROOTFS_FILENAME_SQFS}; then
+	setenv INSTALL_ROOTFS_FILENAME ${ROOTFS_FILENAME_SQFS};
+else
+	echo "ERROR: Could not find any rootfs image";
+	install_abort=1;
 fi
 if test "${install_abort}" = "1"; then
 	echo "To install a different image, set variable 'image-name', e.g.:"