diff options
| author | Simon Glass <sjg@chromium.org> | 2023-08-21 21:17:01 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-31 13:16:55 -0400 |
| commit | 91caa3bb89b112a1421ee2ee3661baf67c64bab9 (patch) | |
| tree | f70b4d2452f8ca45025916cd85f0d1af684902bb /common | |
| parent | 6a32bfae61652f9dae621410ca6e094f374a1f11 (diff) | |
event: Use an event to replace last_stage_init()
Add a new event which handles this function. Convert existing use of
the function to use the new event instead.
Make sure that EVENT is enabled by affected boards, by selecting it from
the LAST_STAGE_INIT option. For x86, enable it by default since all boards
need it.
For controlcenterdc, inline the get_tpm() function and make sure the event
is not built in SPL.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 1 | ||||
| -rw-r--r-- | common/board_r.c | 9 | ||||
| -rw-r--r-- | common/event.c | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/common/Kconfig b/common/Kconfig index 0b09bd68bd..d916194b94 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -720,6 +720,7 @@ config SYS_FSL_CLK config LAST_STAGE_INIT bool "Call board-specific as last setup step" + select EVENT help Some boards need to perform initialisation immediately before control is passed to the command-line interpreter (e.g. for initializations diff --git a/common/board_r.c b/common/board_r.c index 7c1fbc69ed..ad9a3cf633 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -773,15 +773,8 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_POST initr_post, #endif -#ifdef CONFIG_LAST_STAGE_INIT INIT_FUNC_WATCHDOG_RESET - /* - * Some parts can be only initialized if all others (like - * Interrupts) are up and running (i.e. the PC-style ISA - * keyboard). - */ - last_stage_init, -#endif + INITCALL_EVENT(EVT_LAST_STAGE_INIT), #if defined(CFG_PRAM) initr_mem, #endif diff --git a/common/event.c b/common/event.c index 8a61908888..4845104b17 100644 --- a/common/event.c +++ b/common/event.c @@ -36,6 +36,7 @@ const char *const type_name[] = { /* init hooks */ "misc_init_f", "fsp_init_r", + "last_stage_init", /* Fpga load hook */ "fpga_load", |