From: Sughosh Ganu Date: Mon, 26 Aug 2024 11:59:33 +0000 (+0530) Subject: spl: call spl_board_init() at the end of the spl init sequence X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=fa6333afdf3191a09a7c1174c55faa3b111daa6e;p=u-boot.git 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 Reviewed-by: Simon Glass --- diff --git a/common/spl/spl.c b/common/spl/spl.c index ad2dc6a908..c3a4424072 100644 --- 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 */