diff options
| author | Tom Rini <[email protected]> | 2026-04-17 10:12:18 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-17 10:12:18 -0600 |
| commit | 7decfc66197ab9651e8993582224377be3dd8fb5 (patch) | |
| tree | 4ad2250c0ec35ebf9d862ca4ce807c3fd763cdf7 /common | |
| parent | bc6c4ee8d4309af706002a8d8b6bb2871c07fca2 (diff) | |
| parent | 98d1d3227e8d9513a2705e9fa4c8aa9d20d8eeac (diff) | |
Merge tag 'efi-2026-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2026-07-rc1
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29844
Documentation:
* correct title of CONTRIBUTE.rst
* Fix fdt resize argument in fdt_overlays.rst
* api: bootcount: correct bootcount description
* binman: Add Sphinx extension to auto-generate entry and bintool docs
* binman: Remove pre-generated entries.rst and bintools.rst
* j784s4_evm: Automate BAR address lookup for PCIe Boot
UEFI:
* efi_var_sf: Do not fail on blank SPI Flash
* Allow disabling ANSI console queries via Kconfig
* bootstd: efi: Handle prior-stage FDT in network path
* event: Check return value from event_notify_null()
* event: Introduce EVT_POST_PREBOOT event
* fwu: Move boottime checks to EVT_POST_PREBOOT
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 6 | ||||
| -rw-r--r-- | common/event.c | 3 | ||||
| -rw-r--r-- | common/main.c | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8cf0e14679c..5d37345ca09 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -569,11 +569,15 @@ static int dm_announce(void) static int run_main_loop(void) { + int ret; + #ifdef CONFIG_SANDBOX sandbox_main_loop_init(); #endif - event_notify_null(EVT_MAIN_LOOP); + ret = event_notify_null(EVT_MAIN_LOOP); + if (ret) + return ret; /* main_loop() can return to retry autoboot, if so just run it again */ for (;;) diff --git a/common/event.c b/common/event.c index 8d7513eb10b..398e713d2f8 100644 --- a/common/event.c +++ b/common/event.c @@ -49,6 +49,9 @@ const char *const type_name[] = { /* main loop events */ "main_loop", + /* post preboot events */ + "post_preboot", + /* livetree has been built */ "of_live_init", }; diff --git a/common/main.c b/common/main.c index b0b6e74f5d3..4b4504557f6 100644 --- a/common/main.c +++ b/common/main.c @@ -19,6 +19,7 @@ #include <net.h> #include <version_string.h> #include <efi_loader.h> +#include <event.h> static void run_preboot_environment_command(void) { @@ -53,6 +54,9 @@ void main_loop(void) if (IS_ENABLED(CONFIG_USE_PREBOOT)) run_preboot_environment_command(); + if (event_notify_null(EVT_POST_PREBOOT)) + return; + if (IS_ENABLED(CONFIG_UPDATE_TFTP)) update_tftp(0UL, NULL, NULL); |