Set up stdio earlier when using driver model

Since driver model registers itself with the stdio subsystem, and we
want to avoid delayed registration and other complexity associated with
the current serial console, move the stdio subsystem init earlier when
driver model is used for serial.

This simplifies the implementation. Should there be any problems with
this approach they can be dealt with as boards are converted over to
use driver model for serial.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_r.c b/common/board_r.c
index f9647e13583f262a0fd78a389405027bc2108adb..64beae5f348f22f834be6711a30cc99230d34bb6 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -727,6 +727,15 @@ init_fnc_t init_sequence_r[] = {
        set_cpu_clk_info, /* Setup clock information */
 #endif
        initr_reloc_global_data,
+       initr_barrier,
+       initr_malloc,
+       bootstage_relocate,
+#ifdef CONFIG_DM_SERIAL
+       stdio_init,
+#endif
+#ifdef CONFIG_DM
+       initr_dm,
+#endif
        initr_serial,
        initr_announce,
        INIT_FUNC_WATCHDOG_RESET
@@ -762,12 +771,6 @@ init_fnc_t init_sequence_r[] = {
 #endif
 #ifdef CONFIG_WINBOND_83C553
        initr_w83c553f,
-#endif
-       initr_barrier,
-       initr_malloc,
-       bootstage_relocate,
-#ifdef CONFIG_DM
-       initr_dm,
 #endif
 #ifdef CONFIG_ARCH_EARLY_INIT_R
        arch_early_init_r,
@@ -818,7 +821,9 @@ init_fnc_t init_sequence_r[] = {
         */
        initr_pci,
 #endif
+#ifndef CONFIG_DM_SERIAL
        stdio_init,
+#endif
        initr_jumptable,
 #ifdef CONFIG_API
        initr_api,