Merge tag 'dm-pull9apr20' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / cmd / nvedit.c

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 39140c07339c66e6f7f92c05e7f42261777f3753..81d94cd193c6dd6c03d4c843cc6cae2a1284575a 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -28,11 +28,12 @@
 #include <command.h>
 #include <console.h>
 #include <env.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <search.h>
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
 #include <asm/byteorder.h>
@@ -98,7 +99,7 @@ static int env_print(char *name, int flag)
 
                e.key = name;
                e.data = NULL;
-               hsearch_r(e, FIND, &ep, &env_htab, flag);
+               hsearch_r(e, ENV_FIND, &ep, &env_htab, flag);
                if (ep == NULL)
                        return 0;
                len = printf("%s=%s\n", ep->key, ep->data);
@@ -288,7 +289,7 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag)
 
        e.key   = name;
        e.data  = value;
-       hsearch_r(e, ENTER, &ep, &env_htab, env_flag);
+       hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag);
        free(value);
        if (!ep) {
                printf("## Error inserting \"%s\" variable, errno=%d\n",
@@ -360,7 +361,7 @@ ulong env_get_hex(const char *varname, ulong default_val)
 
 int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr)
 {
-       eth_parse_enetaddr(env_get(name), enetaddr);
+       string_to_enetaddr(env_get(name), enetaddr);
        return is_valid_ethaddr(enetaddr);
 }
 
@@ -668,7 +669,7 @@ char *env_get(const char *name)
 
                e.key   = name;
                e.data  = NULL;
-               hsearch_r(e, FIND, &ep, &env_htab, 0);
+               hsearch_r(e, ENV_FIND, &ep, &env_htab, 0);
 
                return ep ? ep->data : NULL;
        }
@@ -680,6 +681,23 @@ char *env_get(const char *name)
        return NULL;
 }
 
+/*
+ * Like env_get, but prints an error if envvar isn't defined in the
+ * environment.  It always returns what env_get does, so it can be used in
+ * place of env_get without changing error handling otherwise.
+ */
+char *from_env(const char *envvar)
+{
+       char *ret;
+
+       ret = env_get(envvar);
+
+       if (!ret)
+               printf("missing environment variable: %s\n", envvar);
+
+       return ret;
+}
+
 /*
  * Look up variable from environment for restricted C runtime env.
  */
@@ -1002,7 +1020,7 @@ NXTARG:           ;
                envp->crc = crc32(0, envp->data,
                                size ? size - offsetof(env_t, data) : ENV_SIZE);
 #ifdef CONFIG_ENV_ADDR_REDUND
-               envp->flags = ACTIVE_FLAG;
+               envp->flags = ENV_REDUND_ACTIVE;
 #endif
        }
        env_set_hex("filesize", len + offsetof(env_t, data));
@@ -1269,7 +1287,7 @@ static int do_env_exists(cmd_tbl_t *cmdtp, int flag, int argc,
 
        e.key = argv[1];
        e.data = NULL;
-       hsearch_r(e, FIND, &ep, &env_htab, 0);
+       hsearch_r(e, ENV_FIND, &ep, &env_htab, 0);
 
        return (ep == NULL) ? 1 : 0;
 }
@@ -1387,7 +1405,7 @@ static char env_help_text[] =
 #endif
        "env print [-a | name ...] - print environment\n"
 #if defined(CONFIG_CMD_NVEDIT_EFI)
-       "env print -e [name ...] - print UEFI environment\n"
+       "env print -e [-guid guid|-all][-n] [name ...] - print UEFI environment\n"
 #endif
 #if defined(CONFIG_CMD_RUN)
        "env run var [...] - run commands in an environment variable\n"
@@ -1399,7 +1417,8 @@ static char env_help_text[] =
 #endif
 #endif
 #if defined(CONFIG_CMD_NVEDIT_EFI)
-       "env set -e name [arg ...] - set UEFI variable; unset if 'arg' not specified\n"
+       "env set -e [-nv][-bs][-rt][-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";
 #endif
@@ -1428,8 +1447,9 @@ U_BOOT_CMD_COMPLETE(
        "print environment variables",
        "[-a]\n    - print [all] values of all environment variables\n"
 #if defined(CONFIG_CMD_NVEDIT_EFI)
-       "printenv -e [name ...]\n"
+       "printenv -e [-guid guid|-all][-n] [name ...]\n"
        "    - print UEFI variable 'name' or all the variables\n"
+       "      \"-n\": suppress dumping variable's value\n"
 #endif
        "printenv name ...\n"
        "    - print value of environment variable 'name'",
@@ -1459,9 +1479,16 @@ U_BOOT_CMD_COMPLETE(
        setenv, CONFIG_SYS_MAXARGS, 0,  do_env_set,
        "set environment variables",
 #if defined(CONFIG_CMD_NVEDIT_EFI)
-       "-e [-nv] name [value ...]\n"
+       "-e [-guid guid][-nv][-bs][-rt][-a][-v]\n"
+       "        [-i addr,size name], or [name [value ...]]\n"
        "    - set UEFI variable 'name' to 'value' ...'\n"
-       "      'nv' option makes the variable non-volatile\n"
+       "      \"-guid\": set vendor guid\n"
+       "      \"-nv\": set non-volatile attribute\n"
+       "      \"-bs\": set boot-service attribute\n"
+       "      \"-rt\": set runtime attribute\n"
+       "      \"-a\": append-write\n"
+       "      \"-i addr,size\": use <addr,size> as variable's value\n"
+       "      \"-v\": verbose message\n"
        "    - delete UEFI variable 'name' if 'value' not specified\n"
 #endif
        "setenv [-f] name value ...\n"