diff options
| author | Tom Rini <[email protected]> | 2025-01-08 18:05:51 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-08 18:05:51 -0600 |
| commit | e13e0a921f444cc12127c8a497dcc476f1268939 (patch) | |
| tree | 19ecf26e4ddc96357f74edc6e7557995de7c0477 /include | |
| parent | 3bfd12008bef1a8353e7ceaca2cb06cf388527ed (diff) | |
| parent | 9c6c7e30aa006a3eab52302e5399f5eb592184ed (diff) | |
Merge tag 'efi-next-20250105' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-next-20250105
Documentation:
* doc: develop: Fix typos and wording in binman/binman.rst
* doc: develop: Fix typos and wording in gdb.rst
* doc: sandbox: Fix the "sb" command name
* doc/develop/distro.rst: Better document upstream definition of extlinux.conf
UEFI:
* efi_loader: avoid writing message in Exit() boot service
* efi_loader: update EFI specification version
* cmd: efidebug: update output of memory attributes
* efi_loader: Don't warn if the TCG2 FinalEvents table is not installed
* cmd: bootmenu: add parameter -e for UEFI boot options
* efi_loader: Update startimage_exit self-test to check error
* efi: Correct ECPT table GUID
Others:
Building the API demo application for riscv64 is supported.
* API: unify platform_sys_info() implementations
* examples: implement _start and syscall for RISC-V
* examples: use architecture specific memset() on RISC-V
* examples: use QEMU compatible LOAD_ADDR on RISC-V
* test: fix test_extension.py
* configs: sandbox_deconfig: remove CONFIG_AMIGA_PARTITION
* CI: xilinx_versal_virt: disable USB_DWC3
* net: eth_bootdev_hunt() should not run DHCP
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi.h | 2 | ||||
| -rw-r--r-- | include/efi_api.h | 8 | ||||
| -rw-r--r-- | include/efi_loader.h | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/efi.h b/include/efi.h index d50b3d3cec9..d005cb6181e 100644 --- a/include/efi.h +++ b/include/efi.h @@ -266,6 +266,8 @@ enum efi_memory_type { #define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */ #define EFI_MEMORY_SP ((u64)0x0000000000040000ULL) /* specific-purpose memory (SPM) */ #define EFI_MEMORY_CPU_CRYPTO ((u64)0x0000000000080000ULL) /* cryptographically protectable */ +#define EFI_MEMORY_HOT_PLUGGABLE \ + ((u64)0x0000000000100000ULL) /* hot pluggable */ #define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */ #define EFI_MEM_DESC_VERSION 1 diff --git a/include/efi_api.h b/include/efi_api.h index 61c4eda8f8a..eb61eafa028 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -20,8 +20,10 @@ #include <charset.h> #include <pe.h> -/* UEFI spec version 2.9 */ -#define EFI_SPECIFICATION_VERSION (2 << 16 | 100) +/** + * define EFI_SPECIFICATION_VERSION - UEFI specification version + */ +#define EFI_SPECIFICATION_VERSION (2 << 16 | 110) /* Types and defines for EFI CreateEvent */ enum efi_timer_delay { @@ -227,7 +229,7 @@ enum efi_reset_type { 0x71, 0x94, 0x19, 0x9a, 0xd9, 0x2a) #define EFI_CONFORMANCE_PROFILES_TABLE_GUID \ - EFI_GUID(0x36122546, 0xf7ef, 0x4c8f, 0xbd, 0x9b, \ + EFI_GUID(0x36122546, 0xf7e7, 0x4c8f, 0xbd, 0x9b, \ 0xeb, 0x85, 0x25, 0xb5, 0x0c, 0x0b) #define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1 diff --git a/include/efi_loader.h b/include/efi_loader.h index 9afbec35ebf..0d858c1e12e 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -711,6 +711,11 @@ efi_status_t efi_search_protocol(const efi_handle_t handle, efi_status_t efi_add_protocol(const efi_handle_t handle, const efi_guid_t *protocol, void *protocol_interface); +/* Reinstall a protocol on a handle */ +efi_status_t EFIAPI efi_reinstall_protocol_interface( + efi_handle_t handle, + const efi_guid_t *protocol, + void *old_interface, void *new_interface); /* Open protocol */ efi_status_t efi_protocol_open(struct efi_handler *handler, void **protocol_interface, void *agent_handle, |