diff mbox series

[2/3] tegra: image: make bootscript standalone

Message ID 20201125161005.2307-2-tmn505@gmail.com
State Accepted
Delegated to: Petr Štetiar
Headers show
Series [1/3] uboot-tegra: bump to 2020.04 | expand

Commit Message

Tomasz Maciej Nowak Nov. 25, 2020, 4:10 p.m. UTC
Don't hard-code the PTUUID, use U-Boot commands to determine it, as some
partitioning tools could rewrite PTUUID when modifying partitions.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---
 target/linux/tegra/image/Makefile           | 5 +----
 target/linux/tegra/image/generic-bootscript | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile
index aa0083f9ae47..fbff1cf6e874 100644
--- a/target/linux/tegra/image/Makefile
+++ b/target/linux/tegra/image/Makefile
@@ -14,10 +14,7 @@  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#@ROOT@#$(IMG_PART_SIGNATURE)#g' \
-		-e 's#@KERNEL@#$(KERNEL_NAME)#g' \
-		$(BOOT_SCRIPT) > $@-boot.scr
+	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 \
diff --git a/target/linux/tegra/image/generic-bootscript b/target/linux/tegra/image/generic-bootscript
index 7e86afdf5fb5..0908025d5d59 100644
--- a/target/linux/tegra/image/generic-bootscript
+++ b/target/linux/tegra/image/generic-bootscript
@@ -1,4 +1,6 @@ 
-setenv bootargs "root=PARTUUID=@ROOT@-02 rw rootwait console=ttyS0,115200 console=tty0"
+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