diff options
| author | Tom Rini <[email protected]> | 2025-05-01 10:48:24 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-05-01 10:48:24 -0600 |
| commit | 152fa1b7fd6b43c727e322aec7a870a33865a248 (patch) | |
| tree | b5ad2c1af26bd0e106c96c5d717178e757ccdcf1 /include | |
| parent | 98a898e58499c78245e4fe36ee404b1b1208e32b (diff) | |
| parent | c0546426724099d94a497ea11ad79862daf37767 (diff) | |
Merge tag 'efi-2025-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-07-rc2
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/26025
Documentation:
* ti: update bash code-block directives to prompt
* ti: k3: add language for code-block directive
* correct uthread inline documentation
UEFI:
* correctly handle EFI FIT images without initrd
* pass kernel load address not entry point for EFI FIT images
Other:
* boot:let BOOTSTAGE_RECORD_COUNT default to 50
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 2 | ||||
| -rw-r--r-- | include/uthread.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 144b749278a..84e8cfe320e 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -597,6 +597,8 @@ efi_status_t efi_env_set_load_options(efi_handle_t handle, const char *env_var, void *efi_get_configuration_table(const efi_guid_t *guid); /* Install device tree */ efi_status_t efi_install_fdt(void *fdt); +/* Install initrd */ +efi_status_t efi_install_initrd(void *initrd, size_t initd_sz); /* Execute loaded UEFI image */ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options); /* Run loaded UEFI image with given fdt */ diff --git a/include/uthread.h b/include/uthread.h index 89fa552a6f6..11a19aa9488 100644 --- a/include/uthread.h +++ b/include/uthread.h @@ -51,7 +51,10 @@ struct uthread { }; /** - * Internal state of a struct uthread_mutex + * enum uthread_mutex_state - internal state of a struct uthread_mutex + * + * @UTHREAD_MUTEX_UNLOCKED: mutex has no owner + * @UTHREAD_MUTEX_LOCKED: mutex has one owner */ enum uthread_mutex_state { UTHREAD_MUTEX_UNLOCKED = 0, @@ -59,7 +62,9 @@ enum uthread_mutex_state { }; /** - * Uthread mutex + * struct uthread_mutex - a mutex object + * + * @state: the internal state of the mutex */ struct uthread_mutex { enum uthread_mutex_state state; |