Просмотр исходного кода

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 <[email protected]>
Tomasz Maciej Nowak 5 лет назад
Родитель
Сommit
4423b2753f
2 измененных файлов с 3 добавлено и 4 удалено
  1. 1 2
      target/linux/tegra/image/Makefile
  2. 2 2
      target/linux/tegra/image/generic-bootscript

+ 1 - 2
target/linux/tegra/image/Makefile

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

+ 2 - 2
target/linux/tegra/image/generic-bootscript

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