From fcd3791535c564943af8f0fbb21d3f697b71c489 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 23 Aug 2021 13:34:11 +0200
Subject: [PATCH] ccimx6ul: boot: set 'rootfsvol' variable for dualboot

Set the new variable 'rootfsvol' to rootfs_a or rootfs_b when dualboot is
enabled, to cover the case where the devices uses the 'system' partition
with different UBI volumes.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt        | 4 ++++
 .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
index b3ddefaf9..9d931bd24 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt
@@ -47,10 +47,12 @@ if test "${dualboot}" = "yes"; then
 				setenv mtdbootpart linux_b
 				setenv mtdlinuxindex ${mtdlinux_b_index}
 				setenv mtdrootfsindex ${mtdrootfs_b_index}
+				setenv rootfsvol ${rootfsvol_b}
 			else
 				setenv mtdbootpart linux_a
 				setenv mtdlinuxindex ${mtdlinux_a_index}
 				setenv mtdrootfsindex ${mtdrootfs_a_index}
+				setenv rootfsvol ${rootfsvol_a}
 			fi
 			setenv active_system ${mtdbootpart}
 			setenv upgrade_available
@@ -62,11 +64,13 @@ if test "${dualboot}" = "yes"; then
 			setenv mtdbootpart ${active_system}
 			setenv mtdlinuxindex ${mtdlinux_a_index}
 			setenv mtdrootfsindex ${mtdrootfs_a_index}
+			setenv rootfsvol ${rootfsvol_a}
 		else
 			echo "Booting from system B"
 			setenv mtdbootpart ${active_system}
 			setenv mtdlinuxindex ${mtdlinux_b_index}
 			setenv mtdrootfsindex ${mtdrootfs_b_index}
+			setenv rootfsvol ${rootfsvol_b}
 		fi
 	fi
 else
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
index 84da4dfde..fab05eb51 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt
@@ -47,10 +47,12 @@ if test "${dualboot}" = "yes"; then
 				setenv mtdbootpart linux_b
 				setenv mtdlinuxindex ${mtdlinux_b_index}
 				setenv mtdrootfsindex ${mtdrootfs_b_index}
+				setenv rootfsvol ${rootfsvol_b}
 			else
 				setenv mtdbootpart linux_a
 				setenv mtdlinuxindex ${mtdlinux_a_index}
 				setenv mtdrootfsindex ${mtdrootfs_a_index}
+				setenv rootfsvol ${rootfsvol_a}
 			fi
 			setenv active_system ${mtdbootpart}
 			setenv upgrade_available
@@ -62,11 +64,13 @@ if test "${dualboot}" = "yes"; then
 			setenv mtdbootpart ${active_system}
 			setenv mtdlinuxindex ${mtdlinux_a_index}
 			setenv mtdrootfsindex ${mtdrootfs_a_index}
+			setenv rootfsvol ${rootfsvol_a}
 		else
 			echo "Booting from system B"
 			setenv mtdbootpart ${active_system}
 			setenv mtdlinuxindex ${mtdlinux_b_index}
 			setenv mtdrootfsindex ${mtdrootfs_b_index}
+			setenv rootfsvol ${rootfsvol_b}
 		fi
 	fi
 else