From 46f7d6a64cf0dc04e3467e5b6009528233252fd8 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 25 Nov 2021 16:03:22 +0100 Subject: [PATCH] u-boot-dey: ccimx6ul: sync boot script with new dualboot variables U-Boot uses partition names instead of partition indexes for the nand devices. This commit syncs the boot scripts with the new dualboot variables. https://onedigi.atlassian.net/browse/CC6UL-1254 Signed-off-by: Arturo Buzarra --- .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 6 ++---- .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) 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 315f0da9b..243cc9d4e 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 @@ -15,14 +15,12 @@ if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then echo "Booting from system A" setenv mtdbootpart ${active_system} - setenv mtdlinuxindex ${mtdlinux_a_index} - setenv mtdrootfsindex ${mtdrootfs_a_index} + setenv mtdrootfspart ${rootfsvol_a} 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 mtdrootfspart ${rootfsvol_b} setenv rootfsvol ${rootfsvol_b} fi fi 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 703d7ecb8..79ab07f02 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 @@ -15,14 +15,12 @@ if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then echo "Booting from system A" setenv mtdbootpart ${active_system} - setenv mtdlinuxindex ${mtdlinux_a_index} - setenv mtdrootfsindex ${mtdrootfs_a_index} + setenv mtdrootfspart ${rootfsvol_a} 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 mtdrootfspart ${rootfsvol_b} setenv rootfsvol ${rootfsvol_b} fi fi