diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
index 136b64444..6f601d6a4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
@@ -1,7 +1,42 @@
 #
-# U-Boot bootscript for NAND images created by Yocto.
+# U-Boot bootscript for NAND/SD images created by Yocto.
 #
 
+# As the first step in the boot script, check if we are using DualBoot and
+# if an upgrade is available. This requires the script to change some variables
+# and save them, while the rest of the script changes variables only temporarily
+# without saving them.
+
+# Dual boot update verification
+if test "${dualboot}" = "yes"; then
+	if test "${upgrade_available}" = "1"; then
+		echo "Update detected; Booting new system in ${active_system} (try ${bootcount})"
+	else
+		if test "${active_system}" = "linux_a"; then
+			echo "Booting from system A"
+			setenv mtdbootpart ${active_system}
+			setenv rootfsvol ${rootfsvol_a}
+		else
+			echo "Booting from system B"
+			setenv mtdbootpart ${active_system}
+			setenv rootfsvol ${rootfsvol_b}
+		fi
+	fi
+else
+	# Check the boot source.
+	if test "${mtdbootpart}" = "linux"; then
+		# We are booting from the NAND using 'linux'.
+		true
+	elif test "${mtdbootpart}" = "recovery"; then
+		# We are booting from the NAND using 'recovery'.
+		setenv boot_initrd true
+		setenv initrd_file uramdisk-recovery.img
+	else
+		# We are booting from the SD card.
+		setenv mmcroot /dev/mmcblk${mmcbootdev}p2
+	fi
+fi
+
 # Back up environment variables
 setenv ORIG_overlays ${overlays}
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
index 05462cb06..1ffeb8f22 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
@@ -1,7 +1,42 @@
 #
-# U-Boot bootscript for NAND images created by Yocto.
+# U-Boot bootscript for NAND/SD images created by Yocto.
 #
 
+# As the first step in the boot script, check if we are using DualBoot and
+# if an upgrade is available. This requires the script to change some variables
+# and save them, while the rest of the script changes variables only temporarily
+# without saving them.
+
+# Dual boot update verification
+if test "${dualboot}" = "yes"; then
+	if test "${upgrade_available}" = "1"; then
+		echo "Update detected; Booting new system in ${active_system} (try ${bootcount})"
+	else
+		if test "${active_system}" = "linux_a"; then
+			echo "Booting from system A"
+			setenv mtdbootpart ${active_system}
+			setenv rootfsvol ${rootfsvol_a}
+		else
+			echo "Booting from system B"
+			setenv mtdbootpart ${active_system}
+			setenv rootfsvol ${rootfsvol_b}
+		fi
+	fi
+else
+	# Check the boot source.
+	if test "${mtdbootpart}" = "linux"; then
+		# We are booting from the NAND using 'linux'.
+		true
+	elif test "${mtdbootpart}" = "recovery"; then
+		# We are booting from the NAND using 'recovery'.
+		setenv boot_initrd true
+		setenv initrd_file uramdisk-recovery.img
+	else
+		# We are booting from the SD card.
+		setenv mmcroot /dev/mmcblk${mmcbootdev}p2
+	fi
+fi
+
 # Back up environment variables
 setenv ORIG_overlays ${overlays}