diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-14 09:47:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-14 09:47:33 -0500 |
| commit | de865f7ee1d9b6dff6e265dee44509c8274ea606 (patch) | |
| tree | d768e1994e43a2b5a1c78961b4a435f41e5ac2a9 /lib/efi_loader/efi_setup.c | |
| parent | 832bfad7451e2e7bd23c96edff2be050905ac3f6 (diff) | |
| parent | af69267c3208e33378241f282a26ea7d50ec691f (diff) | |
Merge tag 'efi-2021-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc3
A part of the EFI_TCG2_PROTOCOL is implemented.
A unit test is supplied.
The following bugs are fixed:
* incorrect buffer size in efi_file_setinfo() leading to creash in SCT
* a crash in UEFI selftest on the sandbox due to removed drivers
* missing newlines in log message for the UEFI RNG driver
Diffstat (limited to 'lib/efi_loader/efi_setup.c')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 45226c5c1a5..e206b60bb82 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -156,6 +156,13 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; } + + if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL)) { + ret = efi_tcg2_register(); + if (ret != EFI_SUCCESS) + goto out; + } + /* Initialize variable services */ ret = efi_init_variables(); if (ret != EFI_SUCCESS) |