From cc2df395c57d471f897b5c3706dd40607ca5bac7 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 28 Sep 2021 17:17:52 +0200 Subject: [PATCH] uboot: ccimx6ul: rename variable for single MTD system partition Rename from 'ubisysvols' to 'singlemtdsys'. Signed-off-by: Hector Palacios --- .../ccimx6ul/install_linux_fw_sd.txt | 8 ++++---- .../ccimx6ul/install_linux_fw_usb.txt | 8 ++++---- .../ccimx6ul/install_linux_fw_uuu.sh | 20 +++++++++---------- .../recovery-initramfs-init | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) 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 2f6f87610..0dca2475d 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 @@ -128,7 +128,7 @@ fi # Set 'bootcmd' to the second part of the script that will # - Reset environment to defaults -# - Restore 'ubisysvols' and 'dualboot' if previously set +# - Restore 'singlemtdsys' and 'dualboot' if previously set # - Run 'partition_nand_linux' script to re-partition the NAND if needed # - Save the environment # - If Dual Boot @@ -140,11 +140,11 @@ fi # - Run 'recovery' and let the system boot after setenv bootcmd " env default -a; - setenv ubisysvols ${ubisysvols}; + setenv singlemtdsys ${singlemtdsys}; setenv dualboot ${dualboot}; run partition_nand_linux; saveenv; - if test \"\$\{ubisysvols\}\" = yes; then + if test \"\$\{singlemtdsys\}\" = yes; then run ubivolscript; else force_erase="-e" @@ -236,7 +236,7 @@ setenv bootcmd " exit; fi; echo \"\"; - if test \"\$\{ubisysvols\}\" != yes; then + if test \"\$\{singlemtdsys\}\" != yes; then nand erase.part update; fi; setenv boot_recovery yes; 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 2210bc23c..e62cbc2e7 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 @@ -128,7 +128,7 @@ fi # Set 'bootcmd' to the second part of the script that will # - Reset environment to defaults -# - Restore 'ubisysvols' and 'dualboot' if previously set +# - Restore 'singlemtdsys' and 'dualboot' if previously set # - Run 'partition_nand_linux' script to re-partition the NAND if needed # - Save the environment # - If Dual Boot @@ -140,11 +140,11 @@ fi # - Run 'recovery' and let the system boot after setenv bootcmd " env default -a; - setenv ubisysvols ${ubisysvols}; + setenv singlemtdsys ${singlemtdsys}; setenv dualboot ${dualboot}; run partition_nand_linux; saveenv; - if test \"\$\{ubisysvols\}\" = yes; then + if test \"\$\{singlemtdsys\}\" = yes; then run ubivolscript; else force_erase="-e" @@ -237,7 +237,7 @@ setenv bootcmd " exit; fi; echo \"\"; - if test \"\$\{ubisysvols\}\" != yes; then + if test \"\$\{singlemtdsys\}\" != yes; then nand erase.part update; fi; setenv boot_recovery yes; 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 ae286effe..ca8305836 100755 --- 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 @@ -63,7 +63,7 @@ part_update() # 'update' command except when a UBI volume is already found. # On the install script, the MTD partition table may have changed, so # we'd better clean the partition. - if [ "${UBISYSVOLS}" != true ]; then + if [ "${SINGLEMTDSYS}" != true ]; then ERASE="-e" fi uuu fb: download -f "${2}" @@ -97,10 +97,10 @@ if [ "${dualboot}" = "yes" ]; then DUALBOOT=true; fi -# Check if ubisysvols variable is active -ubisysvols=$(getenv "ubisysvols") -if [ "${ubisysvols}" = "yes" ]; then - UBISYSVOLS=true; +# Check if singlemtdsys variable is active +singlemtdsys=$(getenv "singlemtdsys") +if [ "${singlemtdsys}" = "yes" ]; then + SINGLEMTDSYS=true; fi echo "" @@ -257,15 +257,15 @@ if [ "${DUALBOOT}" = true ]; then uuu fb: ucmd setenv dualboot yes fi -# Restore ubisysvols if previously active -if [ "${UBISYSVOLS}" = true ]; then - uuu fb: ucmd setenv ubisysvols yes +# Restore singlemtdsys if previously active +if [ "${SINGLEMTDSYS}" = true ]; then + uuu fb: ucmd setenv singlemtdsys yes fi # Create partition table uuu "fb[-t 10000]:" ucmd run partition_nand_linux -if [ "${UBISYSVOLS}" = true ]; then +if [ "${SINGLEMTDSYS}" = true ]; then uuu "fb[-t 10000]:" ucmd run ubivolscript nand erase.part system fi @@ -288,7 +288,7 @@ else part_update "${ROOTFS_NAME}" "${INSTALL_ROOTFS_FILENAME}" 90000 fi -if [ "${UBISYSVOLS}" != true ] && [ "${DUALBOOT}" != true ]; then +if [ "${SINGLEMTDSYS}" != true ] && [ "${DUALBOOT}" != true ]; then # Erase the 'Update' partition uuu fb: ucmd nand erase.part update fi diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init index a74ce2914..8bf44c037 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init +++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init @@ -231,10 +231,10 @@ format_ubi_volume() { psplash_message "Formatting '${1}' partition..." psplash_progress "0" - # Read the ubisysvols variable. - read_uboot_var ubisysvols ubisysvols + # Read the singlemtdsys variable. + read_uboot_var singlemtdsys singlemtdsys - if [ "${ubisysvols}" = "yes" ]; then + if [ "${singlemtdsys}" = "yes" ]; then # Find the volume number associated to the volume name for d in /dev/ubi0_*; do volname="$(ubinfo ${d} | grep ^Name | awk '{print $(2)}')"