From 2d0273b64c2b719d82d5229329b15c3b1a902de4 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 1a1a505..a54b63e 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -166,9 +166,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"); -- 2.7.4