summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2014-07-08 12:47:25 +0200
committerPrzemyslaw Marczak <p.marczak@samsung.com>2015-05-18 11:29:14 +0200
commit5e6129ebcab8e62468fd759f852338b7b0fc924f (patch)
tree8509953d1d2724c21b081d7f56529db1478fddc8
parent0a718767778b00c8b3359e5f46912c6306910824 (diff)
downloadu-boot-5e6129ebcab8e62468fd759f852338b7b0fc924f.tar.gz
u-boot-5e6129ebcab8e62468fd759f852338b7b0fc924f.tar.bz2
u-boot-5e6129ebcab8e62468fd759f852338b7b0fc924f.zip
common:board_f:setup_fdt: set fdt addr by get_board_fdt() for CONFIG_OF_MULTI
Change-Id: I47039ce703c6bd8be18dc932ca67936f1ca5946b Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
-rw-r--r--lib/fdtdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index b76d9cad83..c9d18badda 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1037,6 +1037,10 @@ int fdtdec_decode_memory_region(const void *blob, int config_node,
return 0;
}
+#if defined CONFIG_OF_MULTI
+unsigned long *get_board_fdt(void);
+#endif
+
int fdtdec_setup(void)
{
#ifdef CONFIG_OF_CONTROL
@@ -1047,6 +1051,8 @@ int fdtdec_setup(void)
# ifdef CONFIG_SPL_BUILD
/* FDT is at end of BSS */
gd->fdt_blob = (ulong *)&__bss_end;
+# elif defined CONFIG_OF_MULTI
+ gd->fdt_blob = get_board_fdt();
# else
/* FDT is at end of image */
gd->fdt_blob = (ulong *)&_end;