Merge patch series "Make LMB memory map global and persistent"

[u-boot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 5886d2c5121832d76e4cc6a0218e2380738cd823..c13b2b8f714e40a07ab11dbb1bdf1d63ca8c642a 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -711,9 +711,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        if (CONFIG_IS_ENABLED(SOC_INIT))
                spl_soc_init();
 
-       if (CONFIG_IS_ENABLED(BOARD_INIT))
-               spl_board_init();
-
        if (IS_ENABLED(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT))
                initr_watchdog();
 
@@ -721,6 +718,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
            IS_ENABLED(CONFIG_SPL_ATF) || IS_ENABLED(CONFIG_SPL_NET))
                dram_init_banksize();
 
+       if (IS_ENABLED(CONFIG_SPL_LMB))
+               lmb_init();
+
        if (CONFIG_IS_ENABLED(PCI) && !(gd->flags & GD_FLG_DM_DEAD)) {
                ret = pci_init();
                if (ret)
@@ -728,6 +728,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                /* Don't fail. We still can try other boot methods. */
        }
 
+       if (CONFIG_IS_ENABLED(BOARD_INIT))
+               spl_board_init();
+
        bootcount_inc();
 
        /* Dump driver model states to aid analysis */