Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uboot: ccimx6ul: rename variable for single MTD system partition 

Rename from 'ubisysvols' to 'singlemtdsys'.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2021-09-28 17:17:52 +02:00
parent fa3028a17e
commit cc2df395c5
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt
View File

@ -128,7 +128,7 @@ fi
# Set 'bootcmd' to the second part of the script that will # Set 'bootcmd' to the second part of the script that will
# - Reset environment to defaults # - 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 # - Run 'partition_nand_linux' script to re-partition the NAND if needed
# - Save the environment # - Save the environment
# - If Dual Boot # - If Dual Boot
@ -140,11 +140,11 @@ fi
# - Run 'recovery' and let the system boot after # - Run 'recovery' and let the system boot after
setenv bootcmd " setenv bootcmd "
env default -a; env default -a;
setenv ubisysvols ${ubisysvols}; setenv singlemtdsys ${singlemtdsys};
setenv dualboot ${dualboot}; setenv dualboot ${dualboot};
run partition_nand_linux; run partition_nand_linux;
saveenv; saveenv;
if test \"\$\{ubisysvols\}\" = yes; then if test \"\$\{singlemtdsys\}\" = yes; then
run ubivolscript; run ubivolscript;
else else
force_erase="-e" force_erase="-e"
@ -236,7 +236,7 @@ setenv bootcmd "
exit; exit;
fi; fi;
echo \"\"; echo \"\";
if test \"\$\{ubisysvols\}\" != yes; then if test \"\$\{singlemtdsys\}\" != yes; then
nand erase.part update; nand erase.part update;
fi; fi;
setenv boot_recovery yes; setenv boot_recovery yes;

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt
View File

@ -128,7 +128,7 @@ fi
# Set 'bootcmd' to the second part of the script that will # Set 'bootcmd' to the second part of the script that will
# - Reset environment to defaults # - 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 # - Run 'partition_nand_linux' script to re-partition the NAND if needed
# - Save the environment # - Save the environment
# - If Dual Boot # - If Dual Boot
@ -140,11 +140,11 @@ fi
# - Run 'recovery' and let the system boot after # - Run 'recovery' and let the system boot after
setenv bootcmd " setenv bootcmd "
env default -a; env default -a;
setenv ubisysvols ${ubisysvols}; setenv singlemtdsys ${singlemtdsys};
setenv dualboot ${dualboot}; setenv dualboot ${dualboot};
run partition_nand_linux; run partition_nand_linux;
saveenv; saveenv;
if test \"\$\{ubisysvols\}\" = yes; then if test \"\$\{singlemtdsys\}\" = yes; then
run ubivolscript; run ubivolscript;
else else
force_erase="-e" force_erase="-e"
@ -237,7 +237,7 @@ setenv bootcmd "
exit; exit;
fi; fi;
echo \"\"; echo \"\";
if test \"\$\{ubisysvols\}\" != yes; then if test \"\$\{singlemtdsys\}\" != yes; then
nand erase.part update; nand erase.part update;
fi; fi;
setenv boot_recovery yes; setenv boot_recovery yes;

20
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
View File

@ -63,7 +63,7 @@ part_update()
# 'update' command except when a UBI volume is already found. # 'update' command except when a UBI volume is already found.
# On the install script, the MTD partition table may have changed, so # On the install script, the MTD partition table may have changed, so
# we'd better clean the partition. # we'd better clean the partition.
if [ "${UBISYSVOLS}" != true ]; then if [ "${SINGLEMTDSYS}" != true ]; then
ERASE="-e" ERASE="-e"
fi fi
uuu fb: download -f "${2}" uuu fb: download -f "${2}"
@ -97,10 +97,10 @@ if [ "${dualboot}" = "yes" ]; then
DUALBOOT=true; DUALBOOT=true;
fi fi
# Check if ubisysvols variable is active # Check if singlemtdsys variable is active
ubisysvols=$(getenv "ubisysvols") singlemtdsys=$(getenv "singlemtdsys")
if [ "${ubisysvols}" = "yes" ]; then if [ "${singlemtdsys}" = "yes" ]; then
UBISYSVOLS=true; SINGLEMTDSYS=true;
fi fi
echo "" echo ""
@ -257,15 +257,15 @@ if [ "${DUALBOOT}" = true ]; then
uuu fb: ucmd setenv dualboot yes uuu fb: ucmd setenv dualboot yes
fi fi
# Restore ubisysvols if previously active # Restore singlemtdsys if previously active
if [ "${UBISYSVOLS}" = true ]; then if [ "${SINGLEMTDSYS}" = true ]; then
uuu fb: ucmd setenv ubisysvols yes uuu fb: ucmd setenv singlemtdsys yes
fi fi
# Create partition table # Create partition table
uuu "fb[-t 10000]:" ucmd run partition_nand_linux uuu "fb[-t 10000]:" ucmd run partition_nand_linux
if [ "${UBISYSVOLS}" = true ]; then if [ "${SINGLEMTDSYS}" = true ]; then
uuu "fb[-t 10000]:" ucmd run ubivolscript uuu "fb[-t 10000]:" ucmd run ubivolscript
nand erase.part system nand erase.part system
fi fi
@ -288,7 +288,7 @@ else
part_update "${ROOTFS_NAME}" "${INSTALL_ROOTFS_FILENAME}" 90000 part_update "${ROOTFS_NAME}" "${INSTALL_ROOTFS_FILENAME}" 90000
fi fi
if [ "${UBISYSVOLS}" != true ] && [ "${DUALBOOT}" != true ]; then if [ "${SINGLEMTDSYS}" != true ] && [ "${DUALBOOT}" != true ]; then
# Erase the 'Update' partition # Erase the 'Update' partition
uuu fb: ucmd nand erase.part update uuu fb: ucmd nand erase.part update
fi fi

6
meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
View File

@ -231,10 +231,10 @@ format_ubi_volume() {
psplash_message "Formatting '${1}' partition..." psplash_message "Formatting '${1}' partition..."
psplash_progress "0" psplash_progress "0"
# Read the ubisysvols variable. # Read the singlemtdsys variable.
read_uboot_var ubisysvols ubisysvols read_uboot_var singlemtdsys singlemtdsys
if [ "${ubisysvols}" = "yes" ]; then if [ "${singlemtdsys}" = "yes" ]; then
# Find the volume number associated to the volume name # Find the volume number associated to the volume name
for d in /dev/ubi0_*; do for d in /dev/ubi0_*; do
volname="$(ubinfo ${d} | grep ^Name | awk '{print $(2)}')" volname="$(ubinfo ${d} | grep ^Name | awk '{print $(2)}')"