diff options
| author | Tom Rini <[email protected]> | 2023-07-20 10:19:04 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-20 10:19:04 -0400 |
| commit | 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c (patch) | |
| tree | d109142eaa8cba2ead501a544faf857cadc14c95 /include | |
| parent | 5dcfc99b2b17fa1497adea47a50bf7c7a6ba5709 (diff) | |
| parent | e07368ea57d224557570a6715dcffdbc883a8079 (diff) | |
Merge tag 'efi-2023-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-10-rc1-2
UEFI:
* test: avoid function name 'setup' in capsule tests to not treat it as
a fixture
* ensure that device paths for USB block devices are unique
* enable having multiple EFI_LOADER block devices
* use InstallMultipleProtocolInterfaces() in TCG protocol implementation to
increase UEFI compliance
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_api.h | 7 | ||||
| -rw-r--r-- | include/efi_loader.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index 55a4c989fc7..8f5ef5f680f 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -579,6 +579,13 @@ struct efi_device_path_vendor { u8 vendor_data[]; } __packed; +struct efi_device_path_udevice { + struct efi_device_path dp; + efi_guid_t guid; + int uclass_id; + int dev_number; +} __packed; + struct efi_device_path_controller { struct efi_device_path dp; u32 controller_number; diff --git a/include/efi_loader.h b/include/efi_loader.h index 604fd765f75..b5fa0fe01de 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -662,10 +662,6 @@ efi_status_t efi_protocol_open(struct efi_handler *handler, void **protocol_interface, void *agent_handle, void *controller_handle, uint32_t attributes); -/* Delete protocol from a handle */ -efi_status_t efi_remove_protocol(const efi_handle_t handle, - const efi_guid_t *protocol, - void *protocol_interface); /* Install multiple protocol interfaces */ efi_status_t EFIAPI efi_install_multiple_protocol_interfaces(efi_handle_t *handle, ...); |