diff options
author | Tom Rini <trini@konsulko.com> | 2020-09-19 08:35:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-09-19 08:35:20 -0400 |
commit | 400f84c5baaec9b8a9f30e4ea77785e6f9e00c4b (patch) | |
tree | a38334e5dd5ea274d84f5cb94e0a043ffcb05545 /cmd | |
parent | 667ab37d586e702bc745934afff3dae2f67a2257 (diff) | |
parent | 8f0ac536d4937d07a95fcc56756c14ef7a94e397 (diff) |
Merge tag 'efi-2020-10-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc5 (2)
The following bugs are fixed:
* incorrect online help for setenv and env
* description of function efi_mem_carve_out()
* replace printf() by log_err() in stm32mp1_rng driver
A unit test is provided to check that the boot hart id is provided in the
RISC-V device-tree.
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/nvedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 9f145dd284..7fce723800 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1477,7 +1477,7 @@ static char env_help_text[] = "env select [target] - select environment target\n" #endif #if defined(CONFIG_CMD_NVEDIT_EFI) - "env set -e [-nv][-bs][-rt][-at][-a][-i addr,size][-v] name [arg ...]\n" + "env set -e [-nv][-bs][-rt][-at][-a][-i addr:size][-v] name [arg ...]\n" " - set UEFI variable; unset if '-i' or 'arg' not specified\n" #endif "env set [-f] name [arg ...]\n"; @@ -1541,7 +1541,7 @@ U_BOOT_CMD_COMPLETE( "set environment variables", #if defined(CONFIG_CMD_NVEDIT_EFI) "-e [-guid guid][-nv][-bs][-rt][-at][-a][-v]\n" - " [-i addr,size name], or [name [value ...]]\n" + " [-i addr:size name], or [name [value ...]]\n" " - set UEFI variable 'name' to 'value' ...'\n" " \"-guid\": GUID xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n" " \"-nv\": set non-volatile attribute\n" |