From 8fad761961955ec43035cfb169a7d9636135d4f0 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 27 Jun 2024 14:50:55 +0200 Subject: [PATCH] ccimx6ul: install_linux_fw_uuu.sh: increase timeouts to account for large NANDs When running the installation script on variants with larger NANDs, two of the script's commands take longer than our intended timeouts under specific circumstances: * When the variant has a NAND with 512 MiB or more and singlemtdsys is set to "yes", running ubivolscipt takes longer than our 10 second timeout. The larger the NAND storage size, the longer this command takes. * When the variant has a 1 GiB NAND, singlemtdsys is set to "yes" and dualboot is set to "no", the update of the recovery UBI volume takes longer than our 15 second timeout. In both of these cases, the script fails and the installation process cannot continue. Apply the following changes to prevent this: * Increase the ubivolscript timeout from 10 seconds to 30 * Increase the recovery update timeout from 15 seconds to 20 Also, remove the command immediately before ubivolscript is run, since said command is already being run at the beginning of ubivolscript. https://onedigi.atlassian.net/browse/DEL-9097 Signed-off-by: Gabriel Valcazar --- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 4d5c36083..aed735e7b 100644 --- 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 @@ -325,8 +325,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr} uuu "fb[-t 10000]:" ucmd run partition_nand_linux if [ "${SINGLEMTDSYS}" = true ]; then - uuu "fb[-t 30000]:" ucmd nand erase.part system - uuu "fb[-t 10000]:" ucmd run ubivolscript + uuu "fb[-t 30000]:" ucmd run ubivolscript fi if [ "${DUALBOOT}" = true ]; then @@ -346,7 +345,7 @@ else # Update Linux part_update "${LINUX_NAME}" "${INSTALL_LINUX_FILENAME}" 15000 # Update Recovery - part_update "${RECOVERY_NAME}" "${INSTALL_RECOVERY_FILENAME}" 15000 + part_update "${RECOVERY_NAME}" "${INSTALL_RECOVERY_FILENAME}" 20000 # Update Rootfs part_update "${ROOTFS_NAME}" "${INSTALL_ROOTFS_FILENAME}" 120000 fi