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)
committerJoonyoung Shim <jy0922.shim@samsung.com>
Thu, 15 Jan 2015 06:35:41 +0000 (15:35 +0900)
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 24c04a1efa73410b5d6ebb553a8c6a9a679f8770..a2950c5c079bce95b3d42d496275ed6c4b6f4359 100644 (file)
@@ -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) {