diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-10-01 15:49:53 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-10-01 15:50:10 +0200 |
| commit | 94b47de5f7c40cccd1a7880810142a0cc45bced2 (patch) | |
| tree | fba92006f9077499f596e312c6ea8e10a5a3fcd4 /recipes-bsp | |
| parent | 6d6828218c4c4ecea2c44c114a711fe19359b408 (diff) | |
Revert "boot.cmd: workaround kernel_image getting set to ancient default"
This commit was intended as a last-minute fix for apalis-imx8 which
cannot boot because tezi writes the environment faulty.
This commit however also caused to set kernel_image to Image.gz
which is also used on TK1 and there this does not work at all.
This reverts commit 6d6828218c4c4ecea2c44c114a711fe19359b408.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in | 4 |
1 files changed, 1 insertions, 3 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 7555970..24f15ee 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 @@ -39,6 +39,7 @@ test -n ${boot_part} || env set boot_part ${distro_bootpart} test -n ${root_part} || env set root_part 2 test -n ${boot_devnum} || env set boot_devnum ${devnum} test -n ${root_devnum} || env set root_devnum ${devnum} +test -n ${kernel_image} || env set kernel_image @@KERNEL_IMAGETYPE@@ test -n ${boot_devtype} || env set boot_devtype ${devtype} test -n ${root_devtype} || env set root_devtype ${devtype} test -n ${overlays_file} || env set overlays_file "overlays.txt" @@ -57,9 +58,6 @@ else env set bootcmd_unzip ';' fi -# Workaround Toradex Easy Installer issue causing kernel_image to be wrongly set to ancient default -env set kernel_image @@KERNEL_IMAGETYPE@@ - # Set dynamic commands env set set_bootcmd_kernel 'env set bootcmd_kernel "${load_cmd} \\${kernel_addr_load} \\${kernel_image}"' env set set_bootcmd_dtb 'env set bootcmd_dtb "${load_cmd} \\${fdt_addr_r} \\${fdtfile}"' |