summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2017-04-02 08:25:20 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-10 00:35:06 (GMT)
commit82f766d1d2c580a29bed340ea4dd9fa1b8ff05e0 (patch)
tree81c70f6e469d4431d3852e2d6fe43443fff6ad5a /lib
parent45a6d231b2f9b891a7df517fc40b8466e12f2b57 (diff)
downloadu-boot-82f766d1d2c580a29bed340ea4dd9fa1b8ff05e0.tar.xz
Allow boards to initialize the DT at runtime.
In some boards like the Raspberry Pi the initial bootloader will pass a DT to the kernel. When using U-Boot as such kernel, the board code in U-Boot should be able to provide U-Boot with this, already assembled device tree blob. This patch introduces a new config option CONFIG_OF_BOARD to use instead of CONFIG_OF_EMBED or CONFIG_OF_SEPARATE which will initialize the DT from a board-specific funtion instead of bundling one with U-Boot or as a separated file. This allows boards like the Raspberry Pi to reuse the device tree passed from the bootcode.bin and start.elf firmware files, including the run-time selected device tree overlays. Signed-off-by: Alex Deymo <deymo@google.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/fdtdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 94372cc..c072e54 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1255,6 +1255,9 @@ int fdtdec_setup(void)
/* FDT is at end of image */
gd->fdt_blob = (ulong *)&_end;
# endif
+# elif defined(CONFIG_OF_BOARD)
+ /* Allow the board to override the fdt address. */
+ gd->fdt_blob = board_fdt_blob_setup();
# elif defined(CONFIG_OF_HOSTFILE)
if (sandbox_read_fdt_from_file()) {
puts("Failed to read control FDT\n");