cmd: env: extend "env [set|print] -e" to manage UEFI variables

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

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index acbe85b8e4c48c2af8ad390c328a4fb88d12607b..99a3bc57b15feeb74c6f6d3cf41e1204b078831b 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -28,7 +28,7 @@
 #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>
@@ -94,11 +94,11 @@ static int env_print(char *name, int flag)
        ssize_t len;
 
        if (name) {             /* print a single name */
-               ENTRY e, *ep;
+               struct env_entry e, *ep;
 
                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);
@@ -225,7 +225,7 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag)
 {
        int   i, len;
        char  *name, *value, *s;
-       ENTRY e, *ep;
+       struct env_entry e, *ep;
 
        debug("Initial value for argc=%d\n", argc);
 
@@ -288,7 +288,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",
@@ -473,7 +473,7 @@ static int print_static_binding(const char *var_name, const char *callback_name,
        return 0;
 }
 
-static int print_active_callback(ENTRY *entry)
+static int print_active_callback(struct env_entry *entry)
 {
        struct env_clbk_tbl *clbkp;
        int i;
@@ -554,7 +554,7 @@ static int print_static_flags(const char *var_name, const char *flags,
        return 0;
 }
 
-static int print_active_flags(ENTRY *entry)
+static int print_active_flags(struct env_entry *entry)
 {
        enum env_flags_vartype type;
        enum env_flags_varaccess access;
@@ -662,13 +662,13 @@ static int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc,
 char *env_get(const char *name)
 {
        if (gd->flags & GD_FLG_ENV_READY) { /* after import into hashtable */
-               ENTRY e, *ep;
+               struct env_entry e, *ep;
 
                WATCHDOG_RESET();
 
                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;
        }
@@ -1002,7 +1002,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));
@@ -1262,14 +1262,14 @@ static int do_env_info(cmd_tbl_t *cmdtp, int flag,
 static int do_env_exists(cmd_tbl_t *cmdtp, int flag, int argc,
                       char * const argv[])
 {
-       ENTRY e, *ep;
+       struct env_entry e, *ep;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
        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 +1387,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 +1399,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 +1429,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 +1461,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"