diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
| commit | 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c (patch) | |
| tree | d109142eaa8cba2ead501a544faf857cadc14c95 /lib/efi_loader/efi_tcg2.c | |
| 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 'lib/efi_loader/efi_tcg2.c')
| -rw-r--r-- | lib/efi_loader/efi_tcg2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index a83ae7a46cf..49f8a5e77cb 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1680,8 +1680,8 @@ void tcg2_uninit(void) if (!is_tcg2_protocol_installed()) return; - ret = efi_remove_protocol(efi_root, &efi_guid_tcg2_protocol, - (void *)&efi_tcg2_protocol); + ret = efi_uninstall_multiple_protocol_interfaces(efi_root, &efi_guid_tcg2_protocol, + &efi_tcg2_protocol, NULL); if (ret != EFI_SUCCESS) log_err("Failed to remove EFI TCG2 protocol\n"); } @@ -2507,8 +2507,8 @@ efi_status_t efi_tcg2_register(void) goto fail; } - ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol, - (void *)&efi_tcg2_protocol); + ret = efi_install_multiple_protocol_interfaces(&efi_root, &efi_guid_tcg2_protocol, + &efi_tcg2_protocol, NULL); if (ret != EFI_SUCCESS) { tcg2_uninit(); goto fail; |