From b0ada3f1b18e9bf64b9aade040a4b44101c4b6a7 Mon Sep 17 00:00:00 2001 From: Przemyslaw Marczak Date: Tue, 8 Jul 2014 12:47:25 +0200 Subject: [PATCH] common:board_f:setup_fdt: set fdt addr by get_board_fdt() for CONFIG_OF_MULTI Change-Id: I47039ce703c6bd8be18dc932ca67936f1ca5946b Signed-off-by: Przemyslaw Marczak --- common/board_f.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/board_f.c b/common/board_f.c index e6aa298d5a..31e7f19a19 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -339,6 +339,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 @@ -346,8 +349,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"); -- 2.34.1