diff options
| author | Simon Glass <sjg@chromium.org> | 2023-09-26 08:14:20 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 14:38:12 -0400 |
| commit | 6371c47999ea78d00cf98028ced210bea8337711 (patch) | |
| tree | 6ce30d56e0267d7780be5d7d0b1994b76bb7a8b4 | |
| parent | 6c2bdf5c1a2daec80019b43e52a8537e7cb93ba2 (diff) | |
spl: Drop #ifdefs for BOARD_INIT and watchdog
Avoid using the preprocessor for these checks.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/spl/spl.c | 10 | ||||
| -rw-r--r-- | include/spl.h | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index d930d2083d..530ade556e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -778,13 +778,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } } -#if CONFIG_IS_ENABLED(BOARD_INIT) - spl_board_init(); -#endif + if (CONFIG_IS_ENABLED(BOARD_INIT)) + spl_board_init(); -#if defined(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT) - initr_watchdog(); -#endif + if (IS_ENABLED(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT)) + initr_watchdog(); if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF) || IS_ENABLED(CONFIG_SPL_ATF)) diff --git a/include/spl.h b/include/spl.h index 0fedddd00e..ab06e32ebd 100644 --- a/include/spl.h +++ b/include/spl.h @@ -707,9 +707,13 @@ int spl_early_init(void); */ int spl_init(void); -#ifdef CONFIG_SPL_BOARD_INIT +/* + * spl_board_init() - Do board-specific init in SPL + * + * If xPL_BOARD_INIT is enabled, this is called from board_init_r() before + * jumping to the next phase. + */ void spl_board_init(void); -#endif /** * spl_was_boot_source() - check if U-Boot booted from SPL |