From 1fb7ffc86ea93cf4d0c5f236bff519f18589cc19 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Wed, 6 Nov 2019 10:49:14 +0900 Subject: [PATCH] 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 --- lib/fdtdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 5f41f58..25ea6bb 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1549,8 +1549,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"); -- 2.7.4