Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Drop #ifdefs for BOARD_INIT and watchdog

Browse source 
Avoid using the preprocessor for these checks.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-09-26 08:14:20 -06:00 committed by Tom Rini
parent 6c2bdf5c1a
commit 6371c47999
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/spl/spl.c
View file

@ -778,13 +778,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
} }
} }
#if CONFIG_IS_ENABLED(BOARD_INIT) if (CONFIG_IS_ENABLED(BOARD_INIT))
spl_board_init(); spl_board_init();
#endif
#if defined(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT) if (IS_ENABLED(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT))
initr_watchdog(); initr_watchdog();
#endif
if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF) || if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF) ||
IS_ENABLED(CONFIG_SPL_ATF)) IS_ENABLED(CONFIG_SPL_ATF))

8
include/spl.h
View file

@ -707,9 +707,13 @@ int spl_early_init(void);
*/ */
int spl_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); void spl_board_init(void);
#endif
/** /**
* spl_was_boot_source() - check if U-Boot booted from SPL * spl_was_boot_source() - check if U-Boot booted from SPL