diff options
Diffstat (limited to 'lib/efi_loader')
| -rw-r--r-- | lib/efi_loader/Kconfig | 10 | ||||
| -rw-r--r-- | lib/efi_loader/efi_tcg2.c | 7 |
2 files changed, 4 insertions, 13 deletions
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index f48d9e8b51..3d5a5cd189 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -39,7 +39,6 @@ config CMD_BOOTEFI_BOOTMGR config EFI_SETUP_EARLY bool - default n choice prompt "Store for non-volatile UEFI variables" @@ -113,7 +112,6 @@ config EFI_SET_TIME bool "SetTime() runtime service" depends on EFI_GET_TIME default y if ARCH_QEMU || SANDBOX - default n help Provide the SetTime() runtime service at boottime. This service can be used by an EFI application to adjust the real time clock. @@ -123,7 +121,6 @@ config EFI_HAVE_CAPSULE_SUPPORT config EFI_RUNTIME_UPDATE_CAPSULE bool "UpdateCapsule() runtime service" - default n select EFI_HAVE_CAPSULE_SUPPORT help Select this option if you want to use UpdateCapsule and @@ -132,7 +129,6 @@ config EFI_RUNTIME_UPDATE_CAPSULE config EFI_CAPSULE_ON_DISK bool "Enable capsule-on-disk support" select EFI_HAVE_CAPSULE_SUPPORT - default n help Select this option if you want to use capsule-on-disk feature, that is, capsules can be fetched and executed from files @@ -142,7 +138,6 @@ config EFI_CAPSULE_ON_DISK config EFI_IGNORE_OSINDICATIONS bool "Ignore OsIndications for CapsuleUpdate on-disk" depends on EFI_CAPSULE_ON_DISK - default n help There are boards where U-Boot does not support SetVariable at runtime. Select this option if you want to use the capsule-on-disk feature @@ -152,7 +147,6 @@ config EFI_IGNORE_OSINDICATIONS config EFI_CAPSULE_ON_DISK_EARLY bool "Initiate capsule-on-disk at U-Boot boottime" depends on EFI_CAPSULE_ON_DISK - default n select EFI_SETUP_EARLY help Normally, without this option enabled, capsules will be @@ -163,7 +157,6 @@ config EFI_CAPSULE_ON_DISK_EARLY config EFI_CAPSULE_FIRMWARE bool - default n config EFI_CAPSULE_FIRMWARE_MANAGEMENT bool "Capsule: Firmware Management Protocol" @@ -210,7 +203,6 @@ config EFI_CAPSULE_AUTHENTICATE select PKCS7_VERIFY select IMAGE_SIGN_INFO select EFI_SIGNATURE_SUPPORT - default n help Select this option if you want to enable capsule authentication @@ -271,7 +263,6 @@ endif config EFI_LOADER_BOUNCE_BUFFER bool "EFI Applications use bounce buffers for DMA operations" depends on ARM64 - default n help Some hardware does not support DMA to full 64bit addresses. For this hardware we can create a bounce buffer so that payloads don't have to @@ -357,7 +348,6 @@ config EFI_SECURE_BOOT select PKCS7_MESSAGE_PARSER select PKCS7_VERIFY select EFI_SIGNATURE_SUPPORT - default n help Select this option to enable EFI secure boot support. Once SecureBoot mode is enforced, any EFI binary can run only if diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index d3b8f93f14..74f0bef239 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -14,7 +14,7 @@ #include <efi_tcg2.h> #include <log.h> #include <malloc.h> -#include <version.h> +#include <version_string.h> #include <tpm-v2.h> #include <u-boot/hash-checksum.h> #include <u-boot/sha1.h> @@ -1343,10 +1343,11 @@ out: */ static efi_status_t efi_append_scrtm_version(struct udevice *dev) { - u8 ver[] = U_BOOT_VERSION_STRING; efi_status_t ret; - ret = tcg2_measure_event(dev, 0, EV_S_CRTM_VERSION, sizeof(ver), ver); + ret = tcg2_measure_event(dev, 0, EV_S_CRTM_VERSION, + strlen(version_string) + 1, + (u8 *)version_string); return ret; } |