diff options
| author | Tom Rini | 2024-04-13 10:18:38 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-04-13 10:18:38 -0600 |
| commit | 266603d8c39cf4d194e2cfe8d86d870590e150e0 (patch) | |
| tree | 409a82b720c8845ba8a2ff3289f3801ee4b6d258 /include | |
| parent | 977fc15e9806ce3af2c20228acc3c744f9c3ed0c (diff) | |
| parent | f1f4b0e6f37d801f01d043a1ed44b88e7fdd1d92 (diff) | |
Merge tag 'efi-2024-07-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-07-rc1-2
Documentation:
* bump build dependency idna to 3.7
* update docker image reference to latest
* fix section levels in gen_compile_commands
* fix references to trace doc
UEFI:
* eliminate duplicate runtime section definitions
* let 'EFI using ACPI tables at' be a debug message
* sanitize efi_tcg2_final_events_table definition
* move efi_var_collect to common functions
* improve error messages in variables unit test by using
EFI_UNSUPPORTED for private authenticated variables
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 3 | ||||
| -rw-r--r-- | include/efi_tcg2.h | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 7daca0afba2..bb51c028177 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -345,9 +345,6 @@ extern const efi_guid_t smbios3_guid; 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[]; - /** * struct efi_open_protocol_info_item - open protocol info item * diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index b21c5cb3dd6..a75b5a35b6e 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -150,16 +150,14 @@ struct efi_tcg2_final_events_table { * the variable. * @variable_data_length: The size of the variable data. * @unicode_name: The CHAR16 unicode name of the variable - * without NULL-terminator. - * @variable_data: The data parameter of the efi variable - * in the GetVariable() API. + * without NULL-terminator followed by data. */ struct efi_tcg2_uefi_variable_data { efi_guid_t variable_name; u64 unicode_name_length; u64 variable_data_length; - u16 unicode_name[1]; - u8 variable_data[1]; + u16 unicode_name[]; + // u8 variable_data[]; }; /** |