diff options
| author | Tom Rini <[email protected]> | 2026-05-18 09:12:11 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-05-18 09:12:11 -0600 |
| commit | 38dbe637c9dfcadbd1bc201bfbb27f96b2ad525a (patch) | |
| tree | c71ada65af872f9f110e410670611470359c7b3b /cmd/boot.c | |
| parent | 78319e074d0351e32edf70207c1aca500fe34201 (diff) | |
| parent | 5824ed13bcdf4726c13ef76e8186bc145d8e43f9 (diff) | |
Pull request efi-2026-07-rc3
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/30152
Documentation:
* For reset command describe when the -edl option is available and fix a
typo.
UEFI:
* If efi_allocate_pages() is with EFI_ALLOCATE_ADDRESS fails, return
EFI_NOT_FOUND.
* Fix HII keyboard layout pointer computation and extend HII keyboard
layout tests.
Others:
* In reset command online help show -edl option only when enabled.
Diffstat (limited to 'cmd/boot.c')
| -rw-r--r-- | cmd/boot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/boot.c b/cmd/boot.c index d80f9d8c05d..29cdf4a9a81 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -60,9 +60,12 @@ U_BOOT_CMD( reset, 2, 0, do_reset, "Perform RESET of the CPU", "- cold boot without level specifier\n" +#if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET_ARGS) +// All options handled by sysreset drivers via their sysreset_ops.request_arg callback #ifdef CONFIG_SYSRESET_QCOM_PSCI "reset -edl - Boot to Emergency DownLoad mode\n" #endif +#endif "reset -w - warm reset if implemented" ); |