diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-11-28 09:49:53 +0000 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-12-02 16:31:47 +0100 |
| commit | 9e302296f6ef1529ddc899aef3233fda6658ea33 (patch) | |
| tree | a4cc0c30c98ade98f6d2c3c7b4f0577ce1f0c6f4 | |
| parent | 0a686dd48811aef82fdd72392a1c6dd28046dea1 (diff) | |
u-boot-distro-boot: do not reuse bootcmd variable
The bootcmd variable is the entry point for regular boot. If booting
fails for some reason and one saves the environment at this point,
the next boot will no longer use distro boot. Often booting works
since the boot script setup all variables correctly, so one does not
notice that the boot flow has been altered/hard-coded.
Do not reuse bootcmd to avoid accidentally alter the boot flow.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
(cherry picked from commit 98dbc9f5c52616618cbf722965ce2f5dd90409db)
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in | 6 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in index c7e1a07..9b9a9ef 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in @@ -25,6 +25,6 @@ env set emmcargs_set 'env set emmcargs root=PARTUUID=${uuid} ro rootfstype=ext4 env set bootcmd_args 'env set bootargs ${defargs} ${emmcargs} ${setupargs} ${vidargs} ${tdxargs}' env set bootcmd_kernel 'load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${kernel_image}' env set bootcmd_dtb 'load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${fdtfile}' -env set bootcmd_run '@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr_r}' -env set bootcmd 'run m4boot; run bootcmd_dtb && run uuid_set && run emmcargs_set && run bootcmd_args && run bootcmd_kernel && run bootcmd_run' -run bootcmd +env set bootcmd_boot '@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr_r}' +env set bootcmd_run 'run m4boot; run bootcmd_dtb && run uuid_set && run emmcargs_set && run bootcmd_args && run bootcmd_kernel && run bootcmd_boot' +run bootcmd_run diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in index ca06f1d..88e95f0 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in @@ -36,6 +36,6 @@ then fi env set bootcmd_dtb 'load ${devtype} ${devnum}:2 ${fdt_addr_r} "/boot"${fdt_path}devicetree-${fdtfile}; if test -e ${devtype} ${devnum}:1 ${overlays_file}; then run load_overlay && run apply_overlays || true;fi || true' -env set bootcmd_run '@@KERNEL_BOOTCMD@@ ${kernel_addr_r} ${ramdisk_addr_r}:${ramdisk_size} ${fdt_addr_r}' -env set bootcmd 'run bootcmd_dtb && run bootcmd_args && run bootcmd_load_k && run bootcmd_load_r && run bootcmd_run' -run bootcmd +env set bootcmd_boot '@@KERNEL_BOOTCMD@@ ${kernel_addr_r} ${ramdisk_addr_r}:${ramdisk_size} ${fdt_addr_r}' +env set bootcmd_run 'run bootcmd_dtb && run bootcmd_args && run bootcmd_load_k && run bootcmd_load_r && run bootcmd_boot' +run bootcmd_run |