From: Przemyslaw Marczak <p.marczak@samsung.com>
Date: Thu, 18 Sep 2014 11:02:19 +0000 (+0200)
Subject: samsung:board: don't call set_board_type() for CONFIG_OF_MULTI
X-Git-Tag: submit/tizen/20150522.044923~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffa958b2f05704cb643c23600a7287124408437c;p=platform%2Fkernel%2Fu-boot.git

samsung:board: don't call set_board_type() for CONFIG_OF_MULTI

For this config the set_board_type() is called much more earlier
- in the function setup_fdt(), so the second call in the board file
is unneeded.

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

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 59ae3b54bb..103381f4b7 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -165,8 +165,10 @@ static int board_uart_init(void)
 int board_early_init_f(void)
 {
 	int err;
+#ifndef CONFIG_OF_MULTI
 #ifdef CONFIG_BOARD_TYPES
 	set_board_type();
+#endif
 #endif
 	err = board_uart_init();
 	if (err) {