diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
| commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
| tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /cmd/nvedit.c | |
| parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
| parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'cmd/nvedit.c')
| -rw-r--r-- | cmd/nvedit.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 7e468ab39d..46b1e60f0a 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -767,6 +767,20 @@ U_BOOT_CMD( "save environment variables to persistent storage", "" ); + +#if defined(CONFIG_CMD_ERASEENV) +static int do_env_erase(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return env_erase() ? 1 : 0; +} + +U_BOOT_CMD( + eraseenv, 1, 0, do_env_erase, + "erase environment variables from persistent storage", + "" +); +#endif #endif #endif /* CONFIG_SPL_BUILD */ @@ -1316,6 +1330,9 @@ static cmd_tbl_t cmd_env_sub[] = { #endif #if defined(CONFIG_CMD_SAVEENV) && defined(ENV_IS_IN_DEVICE) U_BOOT_CMD_MKENT(save, 1, 0, do_env_save, "", ""), +#if defined(CONFIG_CMD_ERASEENV) + U_BOOT_CMD_MKENT(erase, 1, 0, do_env_erase, "", ""), +#endif #endif U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), #if defined(CONFIG_CMD_ENV_EXISTS) @@ -1396,6 +1413,9 @@ static char env_help_text[] = #endif #if defined(CONFIG_CMD_SAVEENV) && defined(ENV_IS_IN_DEVICE) "env save - save environment\n" +#if defined(CONFIG_CMD_ERASEENV) + "env erase - erase environment\n" +#endif #endif #if defined(CONFIG_CMD_NVEDIT_EFI) "env set -e name [arg ...] - set UEFI variable; unset if 'arg' not specified\n" |