samsung:board: don't call set_board_type() for CONFIG_OF_MULTI
authorPrzemyslaw Marczak <p.marczak@samsung.com>
Thu, 18 Sep 2014 11:02:19 +0000 (13:02 +0200)
committerLukasz Majewski <l.majewski@samsung.com>
Thu, 30 Oct 2014 08:34:02 +0000 (09:34 +0100)
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>
board/samsung/common/board.c

index 1a1a505..a54b63e 100644 (file)
@@ -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");