summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-11-14 02:13:35 +0300
committerTom Rini <trini@konsulko.com>2021-11-14 02:13:35 +0300
commitb8a156f54ecd1e9a74f48a09a0735b4a41c90eba (patch)
tree7eda0ea12d5af71faaca35ca3f4bd55d4bfb723f /lib
parenta51673eb75de328d3471b742e593f04b166591c4 (diff)
parent2a10e06e07540694d82838793ee7cb34f4dbc59c (diff)
downloadu-boot-b8a156f54ecd1e9a74f48a09a0735b4a41c90eba.tar.xz
Merge tag 'efi-2022-01-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc2-2 UEFI: * fix measurement of BootOrder variable for TCG2 protocol TPM: * TIS mmio driver. This driver supports QEMU's emulated TPM.
Diffstat (limited to 'lib')
-rw-r--r--lib/efi_loader/efi_tcg2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index 586f73af6d..189e4a5ba5 100644
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -1452,8 +1452,8 @@ static efi_status_t tcg2_measure_boot_variable(struct udevice *dev)
boot_order = efi_get_var(var_name, &efi_global_variable_guid,
&var_data_size);
if (!boot_order) {
- ret = EFI_NOT_FOUND;
- goto error;
+ /* If "BootOrder" is not defined, skip the boot variable measurement */
+ return EFI_SUCCESS;
}
ret = tcg2_measure_variable(dev, 1, EV_EFI_VARIABLE_BOOT2, var_name,