summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-10-09 01:43:37 +0300
committerTom Rini <trini@konsulko.com>2019-10-09 01:43:37 +0300
commit8679be295682878177097557867929caa8e26b98 (patch)
tree3e4ac7c3ca2b9ddef6177a0bfdf4f81de7d194fd /cmd
parentca88313dcd02b686851d7bc76fe941935fa014bc (diff)
parent3b728f8728fa7c596d30ecd27ebb64d37a54a12e (diff)
downloadu-boot-8679be295682878177097557867929caa8e26b98.tar.xz
Merge tag 'efi-2020-01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-01-rc1 The major corrections in this pull request are: Fixes for the SetVariable() boot service. Device path node for NVMe drives. Disable CONFIG_CMD_NVEDIT by default.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/Kconfig1
-rw-r--r--cmd/nvedit_efi.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 4e61565aab..8e55b34c96 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -531,7 +531,6 @@ config CMD_ENV_FLAGS
config CMD_NVEDIT_EFI
bool "env [set|print] -e - set/print UEFI variables"
depends on EFI_LOADER
- default y
imply HEXDUMP
help
UEFI variables are encoded as some form of U-Boot variables.
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index ed6d09a530..ede4cd5235 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -330,7 +330,7 @@ out:
}
/**
- * do_env_print_efi() - set UEFI variable
+ * do_env_set_efi() - set UEFI variable
*
* @cmdtp: Command table
* @flag: Command flag