spl: call spl_board_init() at the end of the spl init sequence

The spl_board_init() function on sandbox invokes the unit
tests. Invoking the tests should be done once the rest of the system
has been initialised. Call the spl_board_init() function at the very
end, once the rest of the initilisation functions have been called,
including the setting up of the LMB memory map.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index ad2dc6a908c8398bb1bc6d1d1eb7d5b161187870..c3a44240729ff0a67340cd22d6d2ecdf40809da0 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();
 
@@ -731,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 */