board: nuvoton: use an event to replace last_stage_init()

Add a new event which handles this function refer to commit
("91caa3bb89b1 event: Use an event to replace last_stage_init()")

Signed-off-by: Michael Chang <zhang971090220@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/board/nuvoton/arbel_evb/arbel_evb.c b/board/nuvoton/arbel_evb/arbel_evb.c
index 55e93a7..699e5ca 100644 (file)
--- a/board/nuvoton/arbel_evb/arbel_evb.c
+++ b/board/nuvoton/arbel_evb/arbel_evb.c
@@ -4,6 +4,7 @@
  */
 
 #include <dm.h>
+#include <event.h>
 #include <asm/io.h>
 #include <asm/arch/gcr.h>
 #include "../common/uart.h"
@@ -98,9 +99,5 @@ int dram_init_banksize(void)
        return 0;
 }
 
-int last_stage_init(void)
-{
-       board_set_console();
+EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, board_set_console);
 
-       return 0;
-}

diff --git a/board/nuvoton/common/uart.c b/board/nuvoton/common/uart.c
index b35c795..06f6378 100644 (file)
--- a/board/nuvoton/common/uart.c
+++ b/board/nuvoton/common/uart.c
@@ -14,7 +14,7 @@
 #define UART_LCR       0xc
 #define LCR_DLAB       BIT(7)
 
-void board_set_console(void)
+int board_set_console(void)
 {
        const unsigned long baudrate_table[] = CFG_SYS_BAUDRATE_TABLE;
        struct udevice *dev = gd->cur_serial_dev;
@@ -28,12 +28,12 @@ void board_set_console(void)
        int ret, i;
 
        if (!dev)
-               return;
+               return -ENODEV;
 
        uart_reg = dev_read_addr_ptr(dev);
        ret = clk_get_by_index(dev, 0, &clk);
        if (ret)
-               return;
+               return ret;
 
        uart_clk = clk_get_rate(&clk);
        setbits_8(uart_reg + UART_LCR, LCR_DLAB);
@@ -67,4 +67,5 @@ void board_set_console(void)
        snprintf(string, sizeof(string), "ttyS0,%un8", gd->baudrate);
        env_set("console", string);
 
+       return 0;
 }

diff --git a/board/nuvoton/common/uart.h b/board/nuvoton/common/uart.h
index 9cc8952..fc8ec47 100644 (file)
--- a/board/nuvoton/common/uart.h
+++ b/board/nuvoton/common/uart.h
@@ -6,6 +6,6 @@
 #ifndef _NUVOTON_UART_H
 #define _NUVOTON_UART_H
 
-void board_set_console(void);
+int board_set_console(void);
 
 #endif /* _NUVOTON_COMMON_H */

diff --git a/board/nuvoton/poleg_evb/poleg_evb.c b/board/nuvoton/poleg_evb/poleg_evb.c
index 3c4e5aa..2faa349 100644 (file)
--- a/board/nuvoton/poleg_evb/poleg_evb.c
+++ b/board/nuvoton/poleg_evb/poleg_evb.c
@@ -6,6 +6,7 @@
 
 #include <dm.h>
 #include <env.h>
+#include <event.h>
 #include <asm/io.h>
 #include <asm/arch/gcr.h>
 #include <asm/mach-types.h>
@@ -48,7 +49,7 @@ int dram_init(void)
        return 0;
 }
 
-int last_stage_init(void)
+static int last_stage_init(void)
 {
 
        char value[32];
@@ -68,8 +69,10 @@ int last_stage_init(void)
                }
                sprintf(value, "ttyS%d,115200n8", dev->seq_);
                env_set("console", value);
-               board_set_console();
+               return board_set_console();
        }
 
        return 0;
 }
+EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, last_stage_init);
+

diff --git a/configs/arbel_evb_defconfig b/configs/arbel_evb_defconfig
index 2b0b8b2..9a283b8 100644 (file)
--- a/configs/arbel_evb_defconfig
+++ b/configs/arbel_evb_defconfig
@@ -25,7 +25,6 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run common_bootargs; run romboot"
-CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot>"
 CONFIG_SYS_MAXARGS=32

diff --git a/configs/poleg_evb_defconfig b/configs/poleg_evb_defconfig
index 74f4092..365f643 100644 (file)
--- a/configs/poleg_evb_defconfig
+++ b/configs/poleg_evb_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="nuvoton-npcm750-evb"
 CONFIG_DM_RESET=y
 CONFIG_SYS_LOAD_ADDR=0x10000000
 CONFIG_TARGET_POLEG=y
+CONFIG_SYS_SKIP_UART_INIT=y
 CONFIG_ENV_ADDR=0x80100000
 CONFIG_FIT=y
 CONFIG_USE_BOOTCOMMAND=y