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>

diff --git a/common/board_f.c b/common/board_f.c
index cfd77f865361b53feb3a2945ba6a589a1e62417b..48c42305ec3576d06d2e077b01a44d15b4156abb 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -335,6 +335,9 @@ static int setup_ram_buf(void)
 }
 #endif
 
+#if defined CONFIG_OF_MULTI
+unsigned long *get_board_fdt(void);
+#endif
 static int setup_fdt(void)
 {
 #ifdef CONFIG_OF_CONTROL
@@ -342,8 +345,12 @@ static int setup_fdt(void)
        /* Get a pointer to the FDT */
        gd->fdt_blob = __dtb_dt_begin;
 # elif defined CONFIG_OF_SEPARATE
+#if defined CONFIG_OF_MULTI
+       gd->fdt_blob = get_board_fdt();
+#else
        /* FDT is at end of image */
        gd->fdt_blob = (ulong *)&_end;
+#endif /* CONFIG_OF_MULTI */
 # elif defined(CONFIG_OF_HOSTFILE)
        if (read_fdt_from_file()) {
                puts("Failed to read control FDT\n");