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

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2017-02-01 19:09:41 +01:00
parent 165f7097e4
commit 161117caf0
3 changed files with 18 additions and 6 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-2015.04/ccimx6/install_linux_fw_sd.txt
View File

@ -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

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

@ -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

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

@ -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