spl: use different BOARD_INIT MACRO for spl and tpl

SPL and TPL may not always need spl_board_init() at the same time.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Kever Yang 2018-01-20 18:00:26 +08:00 committed by Tom Rini
parent 2021f083ed
commit af2f44267f
2 changed files with 8 additions and 1 deletions

View File

@ -757,6 +757,13 @@ config TPL
if TPL
config TPL_BOARD_INIT
bool "Call board-specific initialization in TPL"
help
If this option is enabled, U-Boot will call the function
spl_board_init() from board_init_r(). This function should be
provided by the board.
config TPL_LDSCRIPT
string "Linker script for the TPL stage"
depends on TPL

View File

@ -407,7 +407,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
timer_init();
#endif
#ifdef CONFIG_SPL_BOARD_INIT
#if CONFIG_IS_ENABLED(BOARD_INIT)
spl_board_init();
#endif