diff options
| author | Tom Rini <[email protected]> | 2024-06-24 13:34:52 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-06-24 13:34:52 -0600 |
| commit | a7eada24327a40f7ef6c55c220e119839c9d4227 (patch) | |
| tree | efbea0c3cb6845fe9b5841b100c2770a60cb3f68 /boot | |
| parent | d3c610fa462a76880845920e7c535133a264448a (diff) | |
| parent | 9e9f78f7aa0124ef0e622532043acf87e84008dc (diff) | |
Merge tag 'v2024.07-rc5' into next
Prepare v2024.07-rc5
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 6 | ||||
| -rw-r--r-- | boot/bootm.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index de277d2ba50..a212f262274 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -85,7 +85,7 @@ config FIT_SIGNATURE using a hash signed and verified using RSA. If CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive hashing is available using hardware, then the RSA library will use - it. See doc/uImage.FIT/signature.txt for more details. + it. See doc/usage/fit/signature.rst for more details. WARNING: When relying on signed FIT images with a required signature check the legacy image format is disabled by default, so that @@ -223,8 +223,8 @@ config SPL_LOAD_FIT 1. "loadables" images, other than FDTs, which do not have a "load" property will not be loaded. This limitation also applies to FPGA images with the correct "compatible" string. - 2. For FPGA images, the supported "compatible" list is in the - doc/uImage.FIT/source_file_format.txt. + 2. For FPGA images, the supported "compatible" list may be found in + https://fitspec.osfw.foundation/. 3. FDTs are only loaded for images with an "os" property of "u-boot". "linux" images are also supported with Falcon boot mode. diff --git a/boot/bootm.c b/boot/bootm.c index 6fa8edab021..3de87eb185d 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -963,7 +963,7 @@ int bootm_measure(struct bootm_headers *images) goto unmap_initrd; if (IS_ENABLED(CONFIG_MEASURE_DEVICETREE)) { - ret = tcg2_measure_data(dev, &elog, 0, images->ft_len, + ret = tcg2_measure_data(dev, &elog, 1, images->ft_len, (u8 *)images->ft_addr, EV_TABLE_OF_DEVICES, strlen("dts") + 1, |