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 /include | |
| 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 'include')
| -rw-r--r-- | include/bootm.h | 2 | ||||
| -rw-r--r-- | include/image.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/bootm.h b/include/bootm.h index 61160705215..4060cec7fc0 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -25,7 +25,7 @@ struct cmd_tbl; * @addr_img: Address of image to bootm, as passed to * genimg_get_kernel_addr_fit() for processing: * - * NULL: Usees default load address, i.e. image_load_addr + * NULL: Uses default load address, i.e. image_load_addr * <addr>: Uses hex address * * For FIT: diff --git a/include/image.h b/include/image.h index fc2f2487095..9a1c828416d 100644 --- a/include/image.h +++ b/include/image.h @@ -654,10 +654,10 @@ int boot_get_fpga(struct bootm_headers *images); * boot_get_ramdisk() is responsible for finding a valid ramdisk image. * Currently supported are the following ramdisk sources: * - multicomponent kernel/ramdisk image, - * - commandline provided address of decicated ramdisk image. + * - commandline provided address of dedicated ramdisk image. * * returns: - * 0, if ramdisk image was found and valid, or skiped + * 0, if ramdisk image was found and valid, or skipped * rd_start and rd_end are set to ramdisk start/end addresses if * ramdisk image is found and valid * @@ -739,7 +739,7 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr, * @param bootstage_id ID of starting bootstage to use for progress updates. * This will be added to the BOOTSTAGE_SUB values when * calling bootstage_mark() - * @param load_op Decribes what to do with the load address + * @param load_op Describes what to do with the load address * @param datap Returns address of loaded image * @param lenp Returns length of loaded image * Return: node offset of image, or -ve error code on error: @@ -812,7 +812,7 @@ int fit_get_node_from_config(struct bootm_headers *images, * boot_get_fdt() is responsible for finding a valid flat device tree image. * Currently supported are the following FDT sources: * - multicomponent kernel/ramdisk/FDT image, - * - commandline provided address of decicated FDT image. + * - commandline provided address of dedicated FDT image. * * Return: * 0, if fdt image was found and valid, or skipped |