From: Przemyslaw Marczak <p.marczak@samsung.com>
Date: Tue, 8 Jul 2014 10:47:25 +0000 (+0200)
Subject: common:board_f:setup_fdt: set fdt addr by get_board_fdt() for CONFIG_OF_MULTI
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9fe3a8d92699abc96a1911d02d52080857d9615;p=platform%2Fkernel%2Fu-boot.git

common:board_f:setup_fdt: set fdt addr by get_board_fdt() for CONFIG_OF_MULTI

Change-Id: I47039ce703c6bd8be18dc932ca67936f1ca5946b
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
---

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 82d0090f8a..2892f7005a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1210,6 +1210,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)
@@ -1223,6 +1227,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;