dm: Make driver model available before board_init()

[karo-tx-uboot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 64beae5f348f22f834be6711a30cc99230d34bb6..6ac2b7e1601ec5e54230596a1114ca0262dfc063 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -715,6 +715,15 @@ init_fnc_t init_sequence_r[] = {
        /* TODO: could x86/PPC have this also perhaps? */
 #ifdef CONFIG_ARM
        initr_caches,
+#endif
+       initr_reloc_global_data,
+       initr_barrier,
+       initr_malloc,
+       bootstage_relocate,
+#ifdef CONFIG_DM
+       initr_dm,
+#endif
+#ifdef CONFIG_ARM
        board_init,     /* Setup chipselects */
 #endif
        /*
@@ -726,16 +735,7 @@ init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_CLOCKS
        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
+       stdio_init_tables,
        initr_serial,
        initr_announce,
        INIT_FUNC_WATCHDOG_RESET
@@ -821,9 +821,7 @@ init_fnc_t init_sequence_r[] = {
         */
        initr_pci,
 #endif
-#ifndef CONFIG_DM_SERIAL
-       stdio_init,
-#endif
+       stdio_add_devices,
        initr_jumptable,
 #ifdef CONFIG_API
        initr_api,