From: Michal Sojka <michal.sojka@cvut.cz>
Date: Wed, 16 May 2018 16:09:54 +0000 (+0200)
Subject: novaboot: Use FDT address from u-boot variable rather than plain number
X-Git-Tag: 0.0~26
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/4d8a9f12e067848d67cdc79bd037b2f3c4cd42cc

novaboot: Use FDT address from u-boot variable rather than plain number

This should be more robust to possible future changes.
---

diff --git a/build/boot-flashfs b/build/boot-flashfs
index d654a82..36af64e 100755
--- a/build/boot-flashfs
+++ b/build/boot-flashfs
@@ -5,5 +5,5 @@
 load linux-4.4/arch/arm64/boot/Image root=/dev/mmcblk0p1 rw rootwait console=ttyS0,115200n8 console=tty0 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4
 #load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 
-# Use FDT prepared by firmware at address 0x92000000
-UBOOT_CMD=booti ${kernel_addr_r} - 0x92000000
+# Use FDT prepared by firmware at address fdt_addr
+UBOOT_CMD=booti ${kernel_addr_r} - ${fdt_addr}
diff --git a/build/boot-linux b/build/boot-linux
index 83af34a..2b872b9 100755
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -6,5 +6,5 @@ load linux-4.4/arch/arm64/boot/Image console=ttyS0,115200n8 console=tty0 OS=l4t
 #load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 load buildroot/images/rootfs.cpio.uboot
 
-# Use FDT prepared by firmware at address 0x92000000
-UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} 0x92000000
+# Use FDT prepared by firmware at address fdt_addr
+UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}