From 0e221d2ce39c539c17027b4c46baab01c3d8a5a0 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 9 Nov 2022 16:27:08 +0100 Subject: [PATCH] u-boot-dey: ccmp1/cc6ul: ensure 'rootfsvol' value in every case When Dual Boot is not enabled, 'rootfsvol' variable must point to the single boot system rootfs partition 'rootfs'. Explicitly set this value. Otherwise the script relays on the default rootfsvol value, which may be a Dual Boot partition. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 1 + .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt | 1 + 4 files changed, 4 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 243cc9d4e..aeb249064 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 @@ -31,6 +31,7 @@ else else true fi + setenv rootfsvol rootfs 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 79ab07f02..da9bf0a57 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 @@ -31,6 +31,7 @@ else else true fi + setenv rootfsvol rootfs fi 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 6f601d6a4..3f72cee46 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 @@ -35,6 +35,7 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi + setenv rootfsvol rootfs fi # Back up environment variables 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 1ffeb8f22..417993214 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 @@ -35,6 +35,7 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi + setenv rootfsvol rootfs fi # Back up environment variables