tegra: image: remove unnecessary assumptions from bootscript

'bootz' expects gziped kernel image anyway, so hard-code it to zImage,
and remove root path from 'load' commands, by default the files are
searched in root directory.

This will make the bootscript static, so the command which modified it
when image was created can now be removed.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Tomasz Maciej Nowak 2020-11-25 17:10:05 +01:00 committed by maurerr
parent 413f4ba11b
commit 8de3527c22
2 changed files with 3 additions and 4 deletions

View File

@ -14,10 +14,9 @@ define Build/tegra-sdcard
$(if $(DEVICE_DTS),\
$(foreach dtb,$(DEVICE_DTS),$(CP) $(DTS_DIR)/$(dtb).dtb $@.boot), \
$(CP) $(DTS_DIR)/*.dtb $@.boot)
sed -e 's#@KERNEL@#$(KERNEL_NAME)#g' $(BOOT_SCRIPT) > $@-boot.scr
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n '$(DEVICE_TITLE) OpenWrt bootscript' \
-d $@-boot.scr \
-d $(BOOT_SCRIPT) \
$@.boot/boot.scr
SIGNATURE="$(IMG_PART_SIGNATURE)" \

View File

@ -2,7 +2,7 @@ part uuid ${devtype} ${devnum}:2 ptuuid
setenv bootargs "root=PARTUUID=${ptuuid} rw rootwait console=ttyS0,115200 console=tty0"
load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /@KERNEL@
load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /${soc}-${board}.dtb
load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} zImage
load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} ${soc}-${board}.dtb
bootz ${kernel_addr_r} - ${fdt_addr_r}