From 161117caf023ae48f5193f1bc283415ed19fca4d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 1 Feb 2017 19:09:41 +0100 Subject: [PATCH] install_linux: fix failure to boot into recovery On a CC6, the 'env default -a' command deletes the 'soc_family' variable that is used on the U-Boot boot scripts to configure the name of the device tree file to load. Then if we try to boot into recovery directly (without a reset) because the variable is not available, it fails to compose the correct name for the fdt, and gives the error: reading uImage--ccimx6sbc-id129.dtb ** Unable to read file uImage--ccimx6sbc-id129.dtb ** Force a reset, so the 'soc_family' variable is available again and the correct fdt_file is loaded. While on it, add some blank lines to the 'recovery reboot' message, so it's easier to read. Signed-off-by: Javier Viguera --- .../u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt | 8 ++++++-- .../ccimx6ulsbc/install_linux_fw_sd.txt | 8 ++++++-- .../ccimx6ulstarter/install_linux_fw_sd.txt | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt index 0dc005071..e30726d19 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt @@ -165,9 +165,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt index 5c1c46c05..2240940a9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt @@ -112,9 +112,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt index ced13db9a..24ba14447 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt @@ -112,9 +112,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv