diff options
| author | Tom Rini <[email protected]> | 2025-10-26 07:51:18 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-26 09:03:36 -0600 |
| commit | 9094482ca7576877b2bfaa57c8e73cfeb536f8b9 (patch) | |
| tree | a7ab2b7409802fe0dd3b2e36ecad3960c4b52004 /boot | |
| parent | fd976ff3a233ae7c6a9f5bec790b02bbbf57bb24 (diff) | |
| parent | 5335f8d25b2f39b9dd954981364f3cddde01895f (diff) | |
Merge tag 'efi-2026-01-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-01-rc1-2
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/28024
Documentation:
* develop: virtio: Fix qemu example (true/false -> on/off)
* separate read and write command documentation
* usage: Add general rule for `$?`
* askenv: Reword and remove return value
* seama: Reword return value section
* usage: Use glob for all commands
* Fix typos and formatting
UEFI:
* console: support editable input fields
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 4 | ||||
| -rw-r--r-- | boot/image-fit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 022ec05de0a..9adb051400f 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1780,7 +1780,7 @@ menu "Image support" config IMAGE_PRE_LOAD bool "Image pre-load support" help - Enable an image pre-load stage in the SPL. + Enable an image pre-load stage. This pre-load stage allows to do some manipulation or check (for example signature check) on an image before launching it. @@ -1812,7 +1812,7 @@ config IMAGE_PRE_LOAD_SIG u-boot. config SPL_IMAGE_PRE_LOAD_SIG - bool "Image pre-load signature support witin SPL" + bool "Image pre-load signature support within SPL" depends on SPL_IMAGE_PRE_LOAD && IMAGE_PRE_LOAD_SIG select SPL_FIT_SIGNATURE select SPL_RSA diff --git a/boot/image-fit.c b/boot/image-fit.c index 41ab1f552b0..2f2d3e9304d 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1662,7 +1662,7 @@ int fit_check_format(const void *fit, ulong size) if (CONFIG_IS_ENABLED(FIT_FULL_CHECK)) { /* - * If we are not given the size, make do wtih calculating it. + * If we are not given the size, make do with calculating it. * This is not as secure, so we should consider a flag to * control this. */ |