Update Jailhouse submodule (memguard test inmate)

[hercules2020/jailhouse-build.git] / build / boot-flashfs

diff --git a/build/boot-flashfs b/build/boot-flashfs
index 4c801d756d5280432ddf209818b61d8497387446..14f4fec01aa03570c1aec8dd15497a4a4576b60a 100755 (executable)
--- a/build/boot-flashfs
+++ b/build/boot-flashfs
@@ -2,7 +2,8 @@
 
 # Boot localy built Linux kernel with root filesystem from the flash
 
-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
+load kernel-4.4/arch/arm64/boot/Image root=/dev/mmcblk0p1 rw rootwait console=ttyS0,115200n8 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 kernel-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 
-UBOOT_CMD=booti ${kernel_addr_r} - ${fdt_addr_r}
+# Use FDT prepared by firmware at address fdt_addr
+UBOOT_CMD=booti ${kernel_addr_r} - ${fdt_addr}