diff options
| author | Tom Rini | 2023-01-27 14:48:14 -0500 |
|---|---|---|
| committer | Tom Rini | 2023-01-27 14:48:14 -0500 |
| commit | aa7c61f62923a1c9e9ec7f588ad37016d8c7323c (patch) | |
| tree | 1342a4a1602a41c8b9b58d21516ba1bb638cbe50 /include | |
| parent | 424d4f4509a97887647fae9a2a390f043cd60772 (diff) | |
| parent | 15436faa46a9958b019aea22d24bc52eb1da15ff (diff) | |
Merge tag 'efi-2023-04-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-04-rc1-3
Documentation:
* Improve the sl-mx8mm documenation
* Clean up README, move some section to HTML
* Man-pages for the mtime and sleep command
* Description of reducible builds
* Document dynamic event handlers
UEFI:
* Support scrolling in eficonfig command
Other:
* fix mtest on 64 bit systems
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_config.h | 19 | ||||
| -rw-r--r-- | include/efi_loader.h | 1 | ||||
| -rw-r--r-- | include/spl.h | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/include/efi_config.h b/include/efi_config.h index fd699263436..e5edbb5e090 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -9,12 +9,14 @@ #define _EFI_CONFIG_H #include <efi_loader.h> +#include <menu.h> -#define EFICONFIG_ENTRY_NUM_MAX 99 +#define EFICONFIG_ENTRY_NUM_MAX INT_MAX #define EFICONFIG_VOLUME_PATH_MAX 512 #define EFICONFIG_FILE_PATH_MAX 512 #define EFICONFIG_FILE_PATH_BUF_SIZE (EFICONFIG_FILE_PATH_MAX * sizeof(u16)) +extern const char *eficonfig_menu_desc; typedef efi_status_t (*eficonfig_entry_func)(void *data); /** @@ -45,14 +47,20 @@ struct eficonfig_entry { * @active: active menu entry index * @count: total count of menu entry * @menu_header: menu header string + * @menu_desc: menu description string * @list: menu entry list structure + * @start: top menu index to draw + * @end: bottom menu index to draw */ struct efimenu { int delay; int active; int count; char *menu_header; + const char *menu_desc; struct list_head list; + int start; + int end; }; /** @@ -86,9 +94,16 @@ struct eficonfig_select_file_info { }; void eficonfig_print_msg(char *msg); +void eficonfig_print_entry(void *data); +void eficonfig_display_statusline(struct menu *m); +char *eficonfig_choice_entry(void *data); 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_process_common(struct efimenu *efi_menu, + char *menu_header, const char *menu_desc, + void (*display_statusline)(struct menu *), + void (*item_data_print)(void *), + char *(*item_choice)(void *)); 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); diff --git a/include/efi_loader.h b/include/efi_loader.h index f9e427f0905..4560b0d04cb 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -328,6 +328,7 @@ extern const efi_guid_t efi_esrt_guid; extern const efi_guid_t smbios_guid; /*GUID of console */ extern const efi_guid_t efi_guid_text_input_protocol; +extern const efi_guid_t efi_guid_text_output_protocol; extern char __efi_runtime_start[], __efi_runtime_stop[]; extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[]; diff --git a/include/spl.h b/include/spl.h index fb8c279d726..827bd25c883 100644 --- a/include/spl.h +++ b/include/spl.h @@ -535,7 +535,7 @@ const char *spl_board_loader_name(u32 boot_device); void __noreturn jump_to_image_linux(struct spl_image_info *spl_image); /** - * jump_to_image_linux() - Jump to OP-TEE OS from SPL + * jump_to_image_optee() - Jump to OP-TEE OS from SPL * * This jumps into OP-TEE OS using the information in @spl_image. * |