From 1642b807cc3941777c08d19c1163dc497d4333fa Mon Sep 17 00:00:00 2001
From: Przemyslaw Marczak
Date: Thu, 18 Sep 2014 13:02:19 +0200
Subject: [PATCH] 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
---
board/samsung/common/board.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 24c04a1efa..a2950c5c07 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -159,8 +159,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) {
--
2.34.1