From 5e6129ebcab8e62468fd759f852338b7b0fc924f 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 --- lib/fdtdec.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; -- 2.34.1