From b699f648c9eace6f401b26d76d366198ae60b179 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 b361a25..6e6defb 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1173,6 +1173,10 @@ int fdtdec_decode_display_timing(const void *blob, int parent, int index, return 0; } +#if defined CONFIG_OF_MULTI +unsigned long *get_board_fdt(void); +#endif + int fdtdec_setup(void) { #if CONFIG_IS_ENABLED(OF_CONTROL) @@ -1186,6 +1190,8 @@ int fdtdec_setup(void) gd->fdt_blob = (ulong *)&_image_binary_end; else 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.7.4