cmd: fpga: Move error handling to do_fpga()

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

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index ddc888a4fdfc7c98216d9a1ded75f0e8bcea5cd4..793b68b88772f4c997553b31c76044943f5e1ff0 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -777,10 +777,10 @@ int envmatch(uchar *s1, int i2)
 }
 
 #ifndef CONFIG_SPL_BUILD
-static int do_env_default(cmd_tbl_t *cmdtp, int __flag,
+static int do_env_default(cmd_tbl_t *cmdtp, int flag,
                          int argc, char * const argv[])
 {
-       int all = 0, flag = 0;
+       int all = 0, env_flag = H_INTERACTIVE;
 
        debug("Initial value for argc=%d\n", argc);
        while (--argc > 0 && **++argv == '-') {
@@ -792,7 +792,7 @@ static int do_env_default(cmd_tbl_t *cmdtp, int __flag,
                                all = 1;
                                break;
                        case 'f':               /* force */
-                               flag |= H_FORCE;
+                               env_flag |= H_FORCE;
                                break;
                        default:
                                return cmd_usage(cmdtp);
@@ -802,12 +802,13 @@ static int do_env_default(cmd_tbl_t *cmdtp, int __flag,
        debug("Final value for argc=%d\n", argc);
        if (all && (argc == 0)) {
                /* Reset the whole environment */
-               set_default_env("## Resetting to default environment\n");
+               set_default_env("## Resetting to default environment\n",
+                               env_flag);
                return 0;
        }
        if (!all && (argc > 0)) {
                /* Reset individual variables */
-               set_default_vars(argc, argv);
+               set_default_vars(argc, argv, env_flag);
                return 0;
        }
 
@@ -959,7 +960,8 @@ NXTARG:             ;
                                H_MATCH_KEY | H_MATCH_IDENT,
                                &ptr, size, argc, argv);
                if (len < 0) {
-                       pr_err("Cannot export environment: errno = %d\n", errno);
+                       pr_err("## Error: Cannot export environment: errno = %d\n",
+                              errno);
                        return 1;
                }
                sprintf(buf, "%zX", (size_t)len);
@@ -979,7 +981,8 @@ NXTARG:             ;
                        H_MATCH_KEY | H_MATCH_IDENT,
                        &res, ENV_SIZE, argc, argv);
        if (len < 0) {
-               pr_err("Cannot export environment: errno = %d\n", errno);
+               pr_err("## Error: Cannot export environment: errno = %d\n",
+                      errno);
                return 1;
        }
 
@@ -994,15 +997,19 @@ NXTARG:           ;
        return 0;
 
 sep_err:
-       printf("## %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n", cmd);
+       printf("## Error: %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n",
+              cmd);
        return 1;
 }
 #endif
 
 #ifdef CONFIG_CMD_IMPORTENV
 /*
- * env import [-d] [-t [-r] | -b | -c] addr [size]
- *     -d:     delete existing environment before importing;
+ * env import [-d] [-t [-r] | -b | -c] addr [size] [var ...]
+ *     -d:     delete existing environment before importing if no var is
+ *             passed; if vars are passed, if one var is in the current
+ *             environment but not in the environment at addr, delete var from
+ *             current environment;
  *             otherwise overwrite / append to existing definitions
  *     -t:     assume text format; either "size" must be given or the
  *             text data must be '\0' terminated
@@ -1015,6 +1022,11 @@ sep_err:
  *     addr:   memory address to read from
  *     size:   length of input data; if missing, proper '\0'
  *             termination is mandatory
+ *             if var is set and size should be missing (i.e. '\0'
+ *             termination), set size to '-'
+ *     var...  List of the names of the only variables that get imported from
+ *             the environment at address 'addr'. Without arguments, the whole
+ *             environment gets imported.
  */
 static int do_env_import(cmd_tbl_t *cmdtp, int flag,
                         int argc, char * const argv[])
@@ -1026,6 +1038,7 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
        int     fmt = 0;
        int     del = 0;
        int     crlf_is_lf = 0;
+       int     wl = 0;
        size_t  size;
 
        cmd = *argv;
@@ -1074,9 +1087,9 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
        addr = simple_strtoul(argv[0], NULL, 16);
        ptr = map_sysmem(addr, 0);
 
-       if (argc == 2) {
+       if (argc >= 2 && strcmp(argv[1], "-")) {
                size = simple_strtoul(argv[1], NULL, 16);
-       } else if (argc == 1 && chk) {
+       } else if (chk) {
                puts("## Error: external checksum format must pass size\n");
                return CMD_RET_FAILURE;
        } else {
@@ -1098,6 +1111,9 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
                printf("## Info: input data size = %zu = 0x%zX\n", size, size);
        }
 
+       if (argc > 2)
+               wl = 1;
+
        if (chk) {
                uint32_t crc;
                env_t *ep = (env_t *)ptr;
@@ -1112,9 +1128,10 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
                ptr = (char *)ep->data;
        }
 
-       if (himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR,
-                       crlf_is_lf, 0, NULL) == 0) {
-               pr_err("Environment import failed: errno = %d\n", errno);
+       if (!himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR,
+                      crlf_is_lf, wl ? argc - 2 : 0, wl ? &argv[2] : NULL)) {
+               pr_err("## Error: Environment import failed: errno = %d\n",
+                      errno);
                return 1;
        }
        gd->flags |= GD_FLG_ENV_READY;
@@ -1242,7 +1259,7 @@ static char env_help_text[] =
 #endif
 #endif
 #if defined(CONFIG_CMD_IMPORTENV)
-       "env import [-d] [-t [-r] | -b | -c] addr [size] - import environment\n"
+       "env import [-d] [-t [-r] | -b | -c] addr [size] [var ...] - import environment\n"
 #endif
        "env print [-a | name ...] - print environment\n"
 #if defined(CONFIG_CMD_RUN)