From: Michal Sojka <michal.sojka@cvut.cz>
Date: Wed, 16 May 2018 10:26:24 +0000 (+0200)
Subject: Use built-in device tree rahter than the one compiled with the kernel
X-Git-Tag: 0.0~29
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/798f5be052ee00344a93470a105b0b9496088175

Use built-in device tree rahter than the one compiled with the kernel

It seems that some kind of firmware, which runs before U-Boot, modifies the
device tree based on somethig (either configuration in Flash or detected
hardware).

With this, ethernet works even with our kernels booted from network.
diff --git a/build/boot-flashfs b/build/boot-flashfs index 4c801d7..d654a82
100755 --- a/build/boot-flashfs +++ b/build/boot-flashfs @@ -3,6 +3,7 @@
 # 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 linux-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 0x92000000
+UBOOT_CMD=booti ${kernel_addr_r} - 0x92000000
diff --git a/build/boot-linux b/build/boot-linux
index 697fbd9..83af34a 100755
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -3,7 +3,8 @@
 # Boot localy built Linux kernel and initramfs

 load linux-4.4/arch/arm64/boot/Image 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
-load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
+#load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 load buildroot/images/rootfs.cpio.uboot

-UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+# Use FDT prepared by firmware at address 0x92000000
+UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} 0x92000000
---

diff --git a/build/boot-flashfs b/build/boot-flashfs
index 4c801d7..d654a82 100755
--- a/build/boot-flashfs
+++ b/build/boot-flashfs
@@ -3,6 +3,7 @@
 # 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 linux-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 0x92000000
+UBOOT_CMD=booti ${kernel_addr_r} - 0x92000000
diff --git a/build/boot-linux b/build/boot-linux
index 697fbd9..83af34a 100755
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -3,7 +3,8 @@
 # Boot localy built Linux kernel and initramfs
 
 load linux-4.4/arch/arm64/boot/Image 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
-load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
+#load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 load buildroot/images/rootfs.cpio.uboot
 
-UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+# Use FDT prepared by firmware at address 0x92000000
+UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} 0x92000000