diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-03 14:10:17 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-03 14:10:17 +0300 |
| commit | 6e25cfe9a475e8177bad7d9f97cffead6aab6b0d (patch) | |
| tree | 2a74f7339892266a8d1d9afd812e9dad38ba0593 /include | |
| parent | 3570ea1f98229dc8c166dfc2693510db9167f7f8 (diff) | |
| parent | 4ccf678f37731d8ec09eae8dca5f4cbe84132a52 (diff) | |
| download | u-boot-6e25cfe9a475e8177bad7d9f97cffead6aab6b0d.tar.xz | |
Merge tag 'efi-2019-07-rc2' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc2
This pull request provides error fixes for the handling of GPT partitions
and for the UEFI subsystem.
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 7 | ||||
| -rw-r--r-- | include/efi_selftest.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 39ed8a6fa5..7af3f16ef8 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -207,12 +207,17 @@ struct efi_object { * struct efi_loaded_image_obj - handle of a loaded image * * @header: EFI object header + * @exit_status: exit status passed to Exit() + * @exit_data_size: exit data size passed to Exit() + * @exit_data: exit data passed to Exit() * @exit_jmp: long jump buffer for returning form started image * @entry: entry address of the relocated image */ struct efi_loaded_image_obj { struct efi_object header; efi_status_t exit_status; + efi_uintn_t *exit_data_size; + u16 **exit_data; struct jmp_buf_data exit_jmp; EFIAPI efi_status_t (*entry)(efi_handle_t image_handle, struct efi_system_table *st); @@ -560,7 +565,7 @@ struct efi_load_option { u16 file_path_length; u16 *label; struct efi_device_path *file_path; - u8 *optional_data; + const u8 *optional_data; }; void efi_deserialize_load_option(struct efi_load_option *lo, u8 *data); diff --git a/include/efi_selftest.h b/include/efi_selftest.h index 49d3d6d0b4..dd42e49023 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -16,7 +16,7 @@ #define EFI_ST_SUCCESS 0 #define EFI_ST_FAILURE 1 - +#define EFI_ST_SUCCESS_STR L"SUCCESS" /* * Prints a message. */ |