fdtdec: support multi device-tree when OF_SEPARATE is enabled

When CONFIG_OF_SEPARATE is enabled, it needs to call get_board_fdt() for
supporting multi device-tree.

Change-Id: I8345789b55eb7f55d0805e8f164552f72dc6d6ef
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 83bb13530ace72ea34d76a8d66465d0e4627ae51..719f721d62f07c271422ad341c9da39c5a23c494 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1720,8 +1720,12 @@ int fdtdec_setup(void)
        gd->fdt_blob = __dtb_dt_begin;
 #  endif
 # elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
+#ifdef CONFIG_OF_MULTI
+       gd->fdt_blob = get_board_fdt();
+#else
        /* Allow the board to override the fdt address. */
        gd->fdt_blob = board_fdt_blob_setup();
+#endif /* CONFIG_OF_MULTI */
 # elif defined(CONFIG_OF_HOSTFILE)
        if (sandbox_read_fdt_from_file()) {
                puts("Failed to read control FDT\n");