diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-22 08:30:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-22 08:30:53 -0500 |
| commit | 536c642ffef545b4b5b02d065a0c1de9785549d7 (patch) | |
| tree | 07cdfb629c8ec1d88cfcbd21cb9d6171dc1baccb /include | |
| parent | b94db9efe849200d993b7f8a4d0b024e99469599 (diff) | |
| parent | d0f9ae35fb25d732184b8b307a72c7e20b960353 (diff) | |
| download | u-boot-536c642ffef545b4b5b02d065a0c1de9785549d7.zip u-boot-536c642ffef545b4b5b02d065a0c1de9785549d7.tar.gz u-boot-536c642ffef545b4b5b02d065a0c1de9785549d7.tar.bz2 | |
Merge tag 'efi-2023-01-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc2-2
UEFI:
* add UEFI Secure Boot Key enrollment interface to eficonfig command
* fix buffer underflow in FatToStr() implementation
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_config.h | 13 | ||||
| -rw-r--r-- | include/efi_selftest.h | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/efi_config.h b/include/efi_config.h index 098cac2..fd69926 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -89,10 +89,21 @@ void eficonfig_print_msg(char *msg); void eficonfig_destroy(struct efimenu *efi_menu); efi_status_t eficonfig_process_quit(void *data); efi_status_t eficonfig_process_common(struct efimenu *efi_menu, char *menu_header); -efi_status_t eficonfig_select_file_handler(void *data); +efi_status_t eficonfig_process_select_file(void *data); efi_status_t eficonfig_get_unused_bootoption(u16 *buf, efi_uintn_t buf_size, u32 *index); efi_status_t eficonfig_append_bootorder(u16 index); efi_status_t eficonfig_generate_media_device_boot_option(void); +efi_status_t eficonfig_append_menu_entry(struct efimenu *efi_menu, + char *title, eficonfig_entry_func func, + void *data); +efi_status_t eficonfig_append_quit_entry(struct efimenu *efi_menu); +struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_volume, + u16 *current_path); +void *eficonfig_create_fixed_menu(const struct eficonfig_item *items, int count); +#ifdef CONFIG_EFI_SECURE_BOOT +efi_status_t eficonfig_process_secure_boot_config(void *data); +#endif + #endif diff --git a/include/efi_selftest.h b/include/efi_selftest.h index e900cb8..7c69c3f 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -131,7 +131,7 @@ u16 *efi_st_translate_code(u16 code); * @buf2: char string * Return: 0 if both buffers contain equivalent strings */ -int efi_st_strcmp_16_8(const u16 *buf1, const char *buf2); +int efi_st_strcmp_16_8(const u16 *buf1, const unsigned char *buf2); /** * efi_st_get_config_table() - get configuration table |