diff options
| author | Kever Yang <kever.yang@rock-chips.com> | 2018-01-20 18:00:26 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-28 12:27:29 -0500 |
| commit | af2f44267fdc006e47166187632f63d396822bed (patch) | |
| tree | b122c4e20376c6eae6bfd40d72fcf98dd845b1f6 /common/spl | |
| parent | 2021f083ed634f8233054a6299d95666a933434e (diff) | |
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>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 7 | ||||
| -rw-r--r-- | common/spl/spl.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index d686b1ecbd..e1b91f5d89 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -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 diff --git a/common/spl/spl.c b/common/spl/spl.c index 76c1963611..1566acdbc3 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -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 |