summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2014-09-18 13:02:19 +0200
committerPrzemyslaw Marczak <p.marczak@samsung.com>2015-05-18 11:54:53 +0200
commitffa958b2f05704cb643c23600a7287124408437c (patch)
treee2571e25a5d56d1541f0e77cd24546f675dcd1d4
parentb8a6b862d4e55a394512c5e2304c8229c7d1f235 (diff)
downloadu-boot-ffa958b2f05704cb643c23600a7287124408437c.tar.gz
u-boot-ffa958b2f05704cb643c23600a7287124408437c.tar.bz2
u-boot-ffa958b2f05704cb643c23600a7287124408437c.zip
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>
-rw-r--r--board/samsung/common/board.c2
1 files changed, 2 insertions, 0 deletions
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,9 +165,11 @@ 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) {
debug("UART init failed\n");