diff options
| author | Tom Rini <[email protected]> | 2024-06-30 10:59:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-06-30 10:59:42 -0600 |
| commit | 2f9603392355e21c379b4adddea7c6b35cf09b9b (patch) | |
| tree | 3341b0c0f5a604fe1b55781de81a7cad3f36bc10 /boot | |
| parent | 48641bfab793b5ffbf481ee2085fb8c0432da5fa (diff) | |
| parent | 636480e4e7088d05d7ff77af72ca00443c62b3e9 (diff) | |
Merge tag 'efi-2024-10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request efi-2024-10-rc1
Documentation:
Update requirements.txt to use current Python module versions
Add a page describing debugging U-Boot with GDB
FIT: describe data-size as a conditionally mandatory property
Correct link to FIT specification in SPL code.
Correct kaslrseed command long text description
UEFI:
Add unit test checking that don't have kaslr-seed when measuring boot
Deduplicate code for measured boot.
Other:
Print size information in fwu command
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 4 | ||||
| -rw-r--r-- | boot/bootm.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index a212f262274..11175fb7bb2 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -734,6 +734,10 @@ config LEGACY_IMAGE_FORMAT config MEASURED_BOOT bool "Measure boot images and configuration when booting without EFI" depends on HASH && TPM_V2 + select SHA1 + select SHA256 + select SHA384 + select SHA512 help This option enables measurement of the boot process when booting without UEFI . Measurement involves creating cryptographic hashes diff --git a/boot/bootm.c b/boot/bootm.c index 3de87eb185d..376d63aafc9 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -24,6 +24,7 @@ #include <asm/io.h> #include <linux/sizes.h> #include <tpm-v2.h> +#include <tpm_tcg2.h> #if defined(CONFIG_CMD_USB) #include <usb.h> #endif |