common/cmd_nvedit.c

   1 /*
   2  * (C) Copyright 2000-2010
   3  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
   4  *
   5  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
   6  * Andreas Heppel <aheppel@sysgo.de>
   7  *
   8  * Copyright 2011 Freescale Semiconductor, Inc.
   9  *
  10  * See file CREDITS for list of people who contributed to this
  11  * project.
  12  *
  13  * This program is free software; you can redistribute it and/or
  14  * modify it under the terms of the GNU General Public License as
  15  * published by the Free Software Foundation; either version 2 of
  16  * the License, or (at your option) any later version.
  17  *
  18  * This program is distributed in the hope that it will be useful,
  19  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  20  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  21  * GNU General Public License for more details.
  22  *
  23  * You should have received a copy of the GNU General Public License
  24  * along with this program; if not, write to the Free Software
  25  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  26  * MA 02111-1307 USA
  27  */
  28
  29 /*
  30  * Support for persistent environment data
  31  *
  32  * The "environment" is stored on external storage as a list of '\0'
  33  * terminated "name=value" strings. The end of the list is marked by
  34  * a double '\0'. The environment is preceeded by a 32 bit CRC over
  35  * the data part and, in case of redundant environment, a byte of
  36  * flags.
  37  *
  38  * This linearized representation will also be used before
  39  * relocation, i. e. as long as we don't have a full C runtime
  40  * environment. After that, we use a hash table.
  41  */
  42
  43 #include <common.h>
  44 #include <command.h>
  45 #include <environment.h>
  46 #include <search.h>
  47 #include <errno.h>
  48 #include <malloc.h>
  49 #include <watchdog.h>
  50 #include <serial.h>
  51 #include <linux/stddef.h>
  52 #include <asm/byteorder.h>
  53 #if defined(CONFIG_CMD_NET)
  54 #include <net.h>
  55 #endif
  56
  57 DECLARE_GLOBAL_DATA_PTR;
  58
  59 #if !defined(CONFIG_ENV_IS_IN_EEPROM)   && \
  60     !defined(CONFIG_ENV_IS_IN_FLASH)    && \
  61     !defined(CONFIG_ENV_IS_IN_DATAFLASH)        && \
  62     !defined(CONFIG_ENV_IS_IN_MG_DISK)  && \
  63     !defined(CONFIG_ENV_IS_IN_MMC)  && \
  64     !defined(CONFIG_ENV_IS_IN_NAND)     && \
  65     !defined(CONFIG_ENV_IS_IN_NVRAM)    && \
  66     !defined(CONFIG_ENV_IS_IN_ONENAND)  && \
  67     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)        && \
  68     !defined(CONFIG_ENV_IS_NOWHERE)
  69 # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\
  70 SPI_FLASH|MG_DISK|NVRAM|MMC} or CONFIG_ENV_IS_NOWHERE
  71 #endif
  72
  73 #define XMK_STR(x)      #x
  74 #define MK_STR(x)       XMK_STR(x)
  75
  76 /*
  77  * Maximum expected input data size for import command
  78  */
  79 #define MAX_ENV_SIZE    (1 << 20)       /* 1 MiB */
  80
  81 ulong load_addr = CONFIG_SYS_LOAD_ADDR; /* Default Load Address */
  82
  83 /*
  84  * Table with supported baudrates (defined in config_xyz.h)
  85  */
  86 static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
  87 #define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0]))
  88
  89 /*
  90  * This variable is incremented on each do_env_set(), so it can
  91  * be used via get_env_id() as an indication, if the environment
  92  * has changed or not. So it is possible to reread an environment
  93  * variable only if the environment was changed ... done so for
  94  * example in NetInitLoop()
  95  */
  96 static int env_id = 1;
  97
  98 int get_env_id (void)
  99 {
 100         return env_id;
 101 }
 102
 103 /*
 104  * Command interface: print one or all environment variables
 105  *
 106  * Returns 0 in case of error, or length of printed string
 107  */
 108 static int env_print(char *name)
 109 {
 110         char *res = NULL;
 111         size_t len;
 112
 113         if (name) {             /* print a single name */
 114                 ENTRY e, *ep;
 115
 116                 e.key = name;
 117                 e.data = NULL;
 118                 hsearch_r(e, FIND, &ep, &env_htab);
 119                 if (ep == NULL)
 120                         return 0;
 121                 len = printf ("%s=%s\n", ep->key, ep->data);
 122                 return len;
 123         }
 124
 125         /* print whole list */
 126         len = hexport_r(&env_htab, '\n', &res, 0);
 127
 128         if (len > 0) {
 129                 puts(res);
 130                 free(res);
 131                 return len;
 132         }
 133
 134         /* should never happen */
 135         return 0;
 136 }
 137
 138 int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 139 {
 140         int i;
 141         int rcode = 0;
 142
 143         if (argc == 1) {
 144                 /* print all env vars */
 145                 rcode = env_print(NULL);
 146                 if (!rcode)
 147                         return 1;
 148                 printf("\nEnvironment size: %d/%ld bytes\n",
 149                         rcode, (ulong)ENV_SIZE);
 150                 return 0;
 151         }
 152
 153         /* print selected env vars */
 154         for (i = 1; i < argc; ++i) {
 155                 int rc = env_print(argv[i]);
 156                 if (!rc) {
 157                         printf("## Error: \"%s\" not defined\n", argv[i]);
 158                         ++rcode;
 159                 }
 160         }
 161
 162         return rcode;
 163 }
 164
 165 #ifdef CONFIG_CMD_GREPENV
 166 static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 167 {
 168         ENTRY *match;
 169         unsigned char matched[env_htab.size / 8];
 170         int rcode = 1, arg = 1, idx;
 171
 172         if (argc < 2)
 173                 return cmd_usage(cmdtp);
 174
 175         memset(matched, 0, env_htab.size / 8);
 176
 177         while (arg <= argc) {
 178                 idx = 0;
 179                 while ((idx = hstrstr_r(argv[arg], idx, &match, &env_htab))) {
 180                         if (!(matched[idx / 8] & (1 << (idx & 7)))) {
 181                                 puts(match->key);
 182                                 puts("=");
 183                                 puts(match->data);
 184                                 puts("\n");
 185                         }
 186                         matched[idx / 8] |= 1 << (idx & 7);
 187                         rcode = 0;
 188                 }
 189                 arg++;
 190         }
 191
 192         return rcode;
 193 }
 194 #endif
 195
 196 /*
 197  * Set a new environment variable,
 198  * or replace or delete an existing one.
 199  */
 200
 201 int _do_env_set (int flag, int argc, char * const argv[])
 202 {
 203         bd_t  *bd = gd->bd;
 204         int   i, len;
 205         int   console = -1;
 206         char  *name, *value, *s;
 207         ENTRY e, *ep;
 208
 209         name = argv[1];
 210
 211         if (strchr(name, '=')) {
 212                 printf ("## Error: illegal character '=' in variable name \"%s\"\n", name);
 213                 return 1;
 214         }
 215
 216         env_id++;
 217         /*
 218          * search if variable with this name already exists
 219          */
 220         e.key = name;
 221         e.data = NULL;
 222         hsearch_r(e, FIND, &ep, &env_htab);
 223
 224         /* Check for console redirection */
 225         if (strcmp(name,"stdin") == 0) {
 226                 console = stdin;
 227         } else if (strcmp(name,"stdout") == 0) {
 228                 console = stdout;
 229         } else if (strcmp(name,"stderr") == 0) {
 230                 console = stderr;
 231         }
 232
 233         if (console != -1) {
 234                 if (argc < 3) {         /* Cannot delete it! */
 235                         printf("Can't delete \"%s\"\n", name);
 236                         return 1;
 237                 }
 238
 239 #ifdef CONFIG_CONSOLE_MUX
 240                 i = iomux_doenv(console, argv[2]);
 241                 if (i)
 242                         return i;
 243 #else
 244                 /* Try assigning specified device */
 245                 if (console_assign (console, argv[2]) < 0)
 246                         return 1;
 247
 248 #ifdef CONFIG_SERIAL_MULTI
 249                 if (serial_assign (argv[2]) < 0)
 250                         return 1;
 251 #endif
 252 #endif /* CONFIG_CONSOLE_MUX */
 253         }
 254
 255         /*
 256          * Some variables like "ethaddr" and "serial#" can be set only
 257          * once and cannot be deleted; also, "ver" is readonly.
 258          */
 259         if (ep) {               /* variable exists */
 260 #ifndef CONFIG_ENV_OVERWRITE
 261                 if ((strcmp (name, "serial#") == 0) ||
 262                     ((strcmp (name, "ethaddr") == 0)
 263 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
 264                      && (strcmp (ep->data,MK_STR(CONFIG_ETHADDR)) != 0)
 265 #endif  /* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
 266                     ) ) {
 267                         printf ("Can't overwrite \"%s\"\n", name);
 268                         return 1;
 269                 }
 270 #endif
 271                 /*
 272                  * Switch to new baudrate if new baudrate is supported
 273                  */
 274                 if (strcmp(name,"baudrate") == 0) {
 275                         int baudrate = simple_strtoul(argv[2], NULL, 10);
 276                         int i;
 277                         for (i=0; i<N_BAUDRATES; ++i) {
 278                                 if (baudrate == baudrate_table[i])
 279                                         break;
 280                         }
 281                         if (i == N_BAUDRATES) {
 282                                 printf ("## Baudrate %d bps not supported\n",
 283                                         baudrate);
 284                                 return 1;
 285                         }
 286                         printf ("## Switch baudrate to %d bps and press ENTER ...\n",
 287                                 baudrate);
 288                         udelay(50000);
 289                         gd->baudrate = baudrate;
 290 #if defined(CONFIG_PPC) || defined(CONFIG_MCF52x2)
 291                         gd->bd->bi_baudrate = baudrate;
 292 #endif
 293
 294                         serial_setbrg ();
 295                         udelay(50000);
 296                         for (;;) {
 297                                 if (getc() == '\r')
 298                                       break;
 299                         }
 300                 }
 301         }
 302
 303         /* Delete only ? */
 304         if ((argc < 3) || argv[2] == NULL) {
 305                 int rc = hdelete_r(name, &env_htab);
 306                 return !rc;
 307         }
 308
 309         /*
 310          * Insert / replace new value
 311          */
 312         for (i=2,len=0; i<argc; ++i) {
 313                 len += strlen(argv[i]) + 1;
 314         }
 315         if ((value = malloc(len)) == NULL) {
 316                 printf("## Can't malloc %d bytes\n", len);
 317                 return 1;
 318         }
 319         for (i=2,s=value; i<argc; ++i) {
 320                 char *v = argv[i];
 321
 322                 while ((*s++ = *v++) != '\0')
 323                         ;
 324                 *(s-1) = ' ';
 325         }
 326         if (s != value)
 327                 *--s = '\0';
 328
 329         e.key  = name;
 330         e.data = value;
 331         hsearch_r(e, ENTER, &ep, &env_htab);
 332         free(value);
 333         if (!ep) {
 334                 printf("## Error inserting \"%s\" variable, errno=%d\n",
 335                         name, errno);
 336                 return 1;
 337         }
 338
 339         /*
 340          * Some variables should be updated when the corresponding
 341          * entry in the environment is changed
 342          */
 343
 344         if (strcmp(name,"ipaddr") == 0) {
 345                 char *s = argv[2];      /* always use only one arg */
 346                 char *e;
 347                 unsigned long addr;
 348                 bd->bi_ip_addr = 0;
 349                 for (addr=0, i=0; i<4; ++i) {
 350                         ulong val = s ? simple_strtoul(s, &e, 10) : 0;
 351                         addr <<= 8;
 352                         addr  |= (val & 0xFF);
 353                         if (s) s = (*e) ? e+1 : e;
 354                 }
 355                 bd->bi_ip_addr = htonl(addr);
 356                 return 0;
 357         } else if (strcmp(argv[1],"loadaddr") == 0) {
 358                 load_addr = simple_strtoul(argv[2], NULL, 16);
 359                 return 0;
 360         }
 361 #if defined(CONFIG_CMD_NET)
 362         else if (strcmp(argv[1],"bootfile") == 0) {
 363                 copy_filename (BootFile, argv[2], sizeof(BootFile));
 364                 return 0;
 365         }
 366 #endif
 367         return 0;
 368 }
 369
 370 int setenv (char *varname, char *varvalue)
 371 {
 372         char * const argv[4] = { "setenv", varname, varvalue, NULL };
 373         if ((varvalue == NULL) || (varvalue[0] == '\0'))
 374                 return _do_env_set(0, 2, argv);
 375         else
 376                 return _do_env_set(0, 3, argv);
 377 }
 378
 379 int do_env_set (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 380 {
 381         if (argc < 2)
 382                 return cmd_usage(cmdtp);
 383
 384         return _do_env_set(flag, argc, argv);
 385 }
 386
 387 /*
 388  * Prompt for environment variable
 389  */
 390 #if defined(CONFIG_CMD_ASKENV)
 391 int do_env_ask ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 392 {
 393         extern char console_buffer[CONFIG_SYS_CBSIZE];
 394         char message[CONFIG_SYS_CBSIZE];
 395         int size = CONFIG_SYS_CBSIZE - 1;
 396         int i, len, pos;
 397         char *local_args[4];
 398
 399         local_args[0] = argv[0];
 400         local_args[1] = argv[1];
 401         local_args[2] = NULL;
 402         local_args[3] = NULL;
 403
 404         /* Check the syntax */
 405         switch (argc) {
 406         case 1:
 407                 return cmd_usage(cmdtp);
 408
 409         case 2:         /* env_ask envname */
 410                 sprintf(message, "Please enter '%s':", argv[1]);
 411                 break;
 412
 413         case 3:         /* env_ask envname size */
 414                 sprintf(message, "Please enter '%s':", argv[1]);
 415                 size = simple_strtoul(argv[2], NULL, 10);
 416                 break;
 417
 418         default:        /* env_ask envname message1 ... messagen size */
 419                 for (i=2,pos=0; i < argc - 1; i++) {
 420                         if (pos) {
 421                                 message[pos++] = ' ';
 422                         }
 423                         strcpy(message+pos, argv[i]);
 424                         pos += strlen(argv[i]);
 425                 }
 426                 message[pos] = '\0';
 427                 size = simple_strtoul(argv[argc - 1], NULL, 10);
 428                 break;
 429         }
 430
 431         if (size >= CONFIG_SYS_CBSIZE)
 432                 size = CONFIG_SYS_CBSIZE - 1;
 433
 434         if (size <= 0)
 435                 return 1;
 436
 437         /* prompt for input */
 438         len = readline(message);
 439
 440         if (size < len)
 441                 console_buffer[size] = '\0';
 442
 443         len = 2;
 444         if (console_buffer[0] != '\0') {
 445                 local_args[2] = console_buffer;
 446                 len = 3;
 447         }
 448
 449         /* Continue calling setenv code */
 450         return _do_env_set(flag, len, local_args);
 451 }
 452 #endif
 453
 454 /*
 455  * Interactively edit an environment variable
 456  */
 457 #if defined(CONFIG_CMD_EDITENV)
 458 int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 459 {
 460         char buffer[CONFIG_SYS_CBSIZE];
 461         char *init_val;
 462         int len;
 463
 464         if (argc < 2)
 465                 return cmd_usage(cmdtp);
 466
 467         /* Set read buffer to initial value or empty sting */
 468         init_val = getenv(argv[1]);
 469         if (init_val)
 470                 len = sprintf(buffer, "%s", init_val);
 471         else
 472                 buffer[0] = '\0';
 473
 474         readline_into_buffer("edit: ", buffer);
 475
 476         return setenv(argv[1], buffer);
 477 }
 478 #endif /* CONFIG_CMD_EDITENV */
 479
 480 /*
 481  * Look up variable from environment,
 482  * return address of storage for that variable,
 483  * or NULL if not found
 484  */
 485 char *getenv (char *name)
 486 {
 487         if (gd->flags & GD_FLG_ENV_READY) {     /* after import into hashtable */
 488                 ENTRY e, *ep;
 489
 490                 WATCHDOG_RESET();
 491
 492                 e.key  = name;
 493                 e.data = NULL;
 494                 hsearch_r(e, FIND, &ep, &env_htab);
 495
 496                 return (ep ? ep->data : NULL);
 497         }
 498
 499         /* restricted capabilities before import */
 500
 501         if (getenv_f(name, (char *)(gd->env_buf), sizeof(gd->env_buf)) > 0)
 502                 return (char *)(gd->env_buf);
 503
 504         return NULL;
 505 }
 506
 507 /*
 508  * Look up variable from environment for restricted C runtime env.
 509  */
 510 int getenv_f (char *name, char *buf, unsigned len)
 511 {
 512         int i, nxt;
 513
 514         for (i=0; env_get_char(i) != '\0'; i=nxt+1) {
 515                 int val, n;
 516
 517                 for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
 518                         if (nxt >= CONFIG_ENV_SIZE) {
 519                                 return (-1);
 520                         }
 521                 }
 522                 if ((val=envmatch((uchar *)name, i)) < 0)
 523                         continue;
 524
 525                 /* found; copy out */
 526                 for (n=0; n<len; ++n, ++buf) {
 527                         if ((*buf = env_get_char(val++)) == '\0')
 528                                 return n;
 529                 }
 530
 531                 if (n)
 532                         *--buf = '\0';
 533
 534                 printf("env_buf too small [%d]\n", len);
 535
 536                 return n;
 537         }
 538         return (-1);
 539 }
 540
 541 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 542
 543 int do_env_save (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 544 {
 545         extern char * env_name_spec;
 546
 547         printf ("Saving Environment to %s...\n", env_name_spec);
 548
 549         return (saveenv() ? 1 : 0);
 550 }
 551
 552 U_BOOT_CMD(
 553         saveenv, 1, 0,  do_env_save,
 554         "save environment variables to persistent storage",
 555         ""
 556 );
 557
 558 #endif
 559
 560
 561 /*
 562  * Match a name / name=value pair
 563  *
 564  * s1 is either a simple 'name', or a 'name=value' pair.
 565  * i2 is the environment index for a 'name2=value2' pair.
 566  * If the names match, return the index for the value2, else NULL.
 567  */
 568
 569 int envmatch (uchar *s1, int i2)
 570 {
 571
 572         while (*s1 == env_get_char(i2++))
 573                 if (*s1++ == '=')
 574                         return(i2);
 575         if (*s1 == '\0' && env_get_char(i2-1) == '=')
 576                 return(i2);
 577         return(-1);
 578 }
 579
 580 static int do_env_default(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 581 {
 582         if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) {
 583                 return cmd_usage(cmdtp);
 584         }
 585         set_default_env("## Resetting to default environment\n");
 586         return 0;
 587 }
 588
 589 static int do_env_delete(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 590 {
 591         printf("Not implemented yet\n");
 592         return 0;
 593 }
 594
 595 #ifdef CONFIG_CMD_EXPORTENV
 596 /*
 597  * env export [-t | -b | -c] addr [size]
 598  *      -t:     export as text format; if size is given, data will be
 599  *              padded with '\0' bytes; if not, one terminating '\0'
 600  *              will be added (which is included in the "filesize"
 601  *              setting so you can for exmple copy this to flash and
 602  *              keep the termination).
 603  *      -b:     export as binary format (name=value pairs separated by
 604  *              '\0', list end marked by double "\0\0")
 605  *      -c:     export as checksum protected environment format as
 606  *              used for example by "saveenv" command
 607  *      addr:   memory address where environment gets stored
 608  *      size:   size of output buffer
 609  *
 610  * With "-c" and size is NOT given, then the export command will
 611  * format the data as currently used for the persistent storage,
 612  * i. e. it will use CONFIG_ENV_SECT_SIZE as output block size and
 613  * prepend a valid CRC32 checksum and, in case of resundant
 614  * environment, a "current" redundancy flag. If size is given, this
 615  * value will be used instead of CONFIG_ENV_SECT_SIZE; again, CRC32
 616  * checksum and redundancy flag will be inserted.
 617  *
 618  * With "-b" and "-t", always only the real data (including a
 619  * terminating '\0' byte) will be written; here the optional size
 620  * argument will be used to make sure not to overflow the user
 621  * provided buffer; the command will abort if the size is not
 622  * sufficient. Any remainign space will be '\0' padded.
 623  *
 624  * On successful return, the variable "filesize" will be set.
 625  * Note that filesize includes the trailing/terminating '\0' byte(s).
 626  *
 627  * Usage szenario:  create a text snapshot/backup of the current settings:
 628  *
 629  *      => env export -t 100000
 630  *      => era ${backup_addr} +${filesize}
 631  *      => cp.b 100000 ${backup_addr} ${filesize}
 632  *
 633  * Re-import this snapshot, deleting all other settings:
 634  *
 635  *      => env import -d -t ${backup_addr}
 636  */
 637 static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 638 {
 639         char    buf[32];
 640         char    *addr, *cmd, *res;
 641         size_t  size;
 642         ssize_t len;
 643         env_t   *envp;
 644         char    sep = '\n';
 645         int     chk = 0;
 646         int     fmt = 0;
 647
 648         cmd = *argv;
 649
 650         while (--argc > 0 && **++argv == '-') {
 651                 char *arg = *argv;
 652                 while (*++arg) {
 653                         switch (*arg) {
 654                         case 'b':               /* raw binary format */
 655                                 if (fmt++)
 656                                         goto sep_err;
 657                                 sep = '\0';
 658                                 break;
 659                         case 'c':               /* external checksum format */
 660                                 if (fmt++)
 661                                         goto sep_err;
 662                                 sep = '\0';
 663                                 chk = 1;
 664                                 break;
 665                         case 't':               /* text format */
 666                                 if (fmt++)
 667                                         goto sep_err;
 668                                 sep = '\n';
 669                                 break;
 670                         default:
 671                                 return cmd_usage(cmdtp);
 672                         }
 673                 }
 674         }
 675
 676         if (argc < 1) {
 677                 return cmd_usage(cmdtp);
 678         }
 679
 680         addr = (char *)simple_strtoul(argv[0], NULL, 16);
 681
 682         if (argc == 2) {
 683                 size = simple_strtoul(argv[1], NULL, 16);
 684                 memset(addr, '\0', size);
 685         } else {
 686                 size = 0;
 687         }
 688
 689         if (sep) {              /* export as text file */
 690                 len = hexport_r(&env_htab, sep, &addr, size);
 691                 if (len < 0) {
 692                         error("Cannot export environment: errno = %d\n",
 693                                 errno);
 694                         return 1;
 695                 }
 696                 sprintf(buf, "%zX", (size_t)len);
 697                 setenv("filesize", buf);
 698
 699                 return 0;
 700         }
 701
 702         envp = (env_t *)addr;
 703
 704         if (chk)                /* export as checksum protected block */
 705                 res = (char *)envp->data;
 706         else                    /* export as raw binary data */
 707                 res = addr;
 708
 709         len = hexport_r(&env_htab, '\0', &res, ENV_SIZE);
 710         if (len < 0) {
 711                 error("Cannot export environment: errno = %d\n",
 712                         errno);
 713                 return 1;
 714         }
 715
 716         if (chk) {
 717                 envp->crc   = crc32(0, envp->data, ENV_SIZE);
 718 #ifdef CONFIG_ENV_ADDR_REDUND
 719                 envp->flags = ACTIVE_FLAG;
 720 #endif
 721         }
 722         sprintf(buf, "%zX", (size_t)(len + offsetof(env_t,data)));
 723         setenv("filesize", buf);
 724
 725         return 0;
 726
 727 sep_err:
 728         printf("## %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n",
 729                 cmd);
 730         return 1;
 731 }
 732 #endif
 733
 734 #ifdef CONFIG_CMD_IMPORTENV
 735 /*
 736  * env import [-d] [-t | -b | -c] addr [size]
 737  *      -d:     delete existing environment before importing;
 738  *              otherwise overwrite / append to existion definitions
 739  *      -t:     assume text format; either "size" must be given or the
 740  *              text data must be '\0' terminated
 741  *      -b:     assume binary format ('\0' separated, "\0\0" terminated)
 742  *      -c:     assume checksum protected environment format
 743  *      addr:   memory address to read from
 744  *      size:   length of input data; if missing, proper '\0'
 745  *              termination is mandatory
 746  */
 747 static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 748 {
 749         char    *cmd, *addr;
 750         char    sep = '\n';
 751         int     chk = 0;
 752         int     fmt = 0;
 753         int     del = 0;
 754         size_t  size;
 755
 756         cmd = *argv;
 757
 758         while (--argc > 0 && **++argv == '-') {
 759                 char *arg = *argv;
 760                 while (*++arg) {
 761                         switch (*arg) {
 762                         case 'b':               /* raw binary format */
 763                                 if (fmt++)
 764                                         goto sep_err;
 765                                 sep = '\0';
 766                                 break;
 767                         case 'c':               /* external checksum format */
 768                                 if (fmt++)
 769                                         goto sep_err;
 770                                 sep = '\0';
 771                                 chk = 1;
 772                                 break;
 773                         case 't':               /* text format */
 774                                 if (fmt++)
 775                                         goto sep_err;
 776                                 sep = '\n';
 777                                 break;
 778                         case 'd':
 779                                 del = 1;
 780                                 break;
 781                         default:
 782                                 return cmd_usage(cmdtp);
 783                         }
 784                 }
 785         }
 786
 787         if (argc < 1) {
 788                 return cmd_usage(cmdtp);
 789         }
 790
 791         if (!fmt)
 792                 printf("## Warning: defaulting to text format\n");
 793
 794         addr = (char *)simple_strtoul(argv[0], NULL, 16);
 795
 796         if (argc == 2) {
 797                 size = simple_strtoul(argv[1], NULL, 16);
 798         } else {
 799                 char *s = addr;
 800
 801                 size = 0;
 802
 803                 while (size < MAX_ENV_SIZE) {
 804                         if ((*s == sep) && (*(s+1) == '\0'))
 805                                 break;
 806                         ++s;
 807                         ++size;
 808                 }
 809                 if (size == MAX_ENV_SIZE) {
 810                         printf("## Warning: Input data exceeds %d bytes"
 811                                 " - truncated\n", MAX_ENV_SIZE);
 812                 }
 813                 ++size;
 814                 printf("## Info: input data size = %zd = 0x%zX\n", size, size);
 815         }
 816
 817         if (chk) {
 818                 uint32_t crc;
 819                 env_t *ep = (env_t *)addr;
 820
 821                 size -= offsetof(env_t, data);
 822                 memcpy(&crc, &ep->crc, sizeof(crc));
 823
 824                 if (crc32(0, ep->data, size) != crc) {
 825                         puts("## Error: bad CRC, import failed\n");
 826                         return 1;
 827                 }
 828                 addr = (char *)ep->data;
 829         }
 830
 831         if (himport_r(&env_htab, addr, size, sep, del ? 0 : H_NOCLEAR) == 0) {
 832                 error("Environment import failed: errno = %d\n", errno);
 833                 return 1;
 834         }
 835         gd->flags |= GD_FLG_ENV_READY;
 836
 837         return 0;
 838
 839 sep_err:
 840         printf("## %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n",
 841                 cmd);
 842         return 1;
 843 }
 844 #endif
 845
 846 #if defined(CONFIG_CMD_RUN)
 847 extern int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 848 #endif
 849
 850 /*
 851  * New command line interface: "env" command with subcommands
 852  */
 853 static cmd_tbl_t cmd_env_sub[] = {
 854 #if defined(CONFIG_CMD_ASKENV)
 855         U_BOOT_CMD_MKENT(ask, CONFIG_SYS_MAXARGS, 1, do_env_ask, "", ""),
 856 #endif
 857         U_BOOT_CMD_MKENT(default, 1, 0, do_env_default, "", ""),
 858         U_BOOT_CMD_MKENT(delete, 2, 0, do_env_delete, "", ""),
 859 #if defined(CONFIG_CMD_EDITENV)
 860         U_BOOT_CMD_MKENT(edit, 2, 0, do_env_edit, "", ""),
 861 #endif
 862 #if defined(CONFIG_CMD_EXPORTENV)
 863         U_BOOT_CMD_MKENT(export, 4, 0, do_env_export, "", ""),
 864 #endif
 865 #if defined(CONFIG_CMD_GREPENV)
 866         U_BOOT_CMD_MKENT(grep, CONFIG_SYS_MAXARGS, 1, do_env_grep, "", ""),
 867 #endif
 868 #if defined(CONFIG_CMD_IMPORTENV)
 869         U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""),
 870 #endif
 871         U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""),
 872 #if defined(CONFIG_CMD_RUN)
 873         U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""),
 874 #endif
 875 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 876         U_BOOT_CMD_MKENT(save, 1, 0, do_env_save, "", ""),
 877 #endif
 878         U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""),
 879 };
 880
 881 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 882 void env_reloc(void)
 883 {
 884         fixup_cmdtable(cmd_env_sub, ARRAY_SIZE(cmd_env_sub));
 885 }
 886 #endif
 887
 888 static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 889 {
 890         cmd_tbl_t *cp;
 891
 892         if (argc < 2)
 893                 return cmd_usage(cmdtp);
 894
 895         /* drop initial "env" arg */
 896         argc--;
 897         argv++;
 898
 899         cp = find_cmd_tbl(argv[0], cmd_env_sub, ARRAY_SIZE(cmd_env_sub));
 900
 901         if (cp)
 902                 return cp->cmd(cmdtp, flag, argc, argv);
 903
 904         return cmd_usage(cmdtp);
 905 }
 906
 907 U_BOOT_CMD(
 908         env, CONFIG_SYS_MAXARGS, 1, do_env,
 909         "environment handling commands",
 910 #if defined(CONFIG_CMD_ASKENV)
 911         "ask name [message] [size] - ask for environment variable\nenv "
 912 #endif
 913         "default -f - reset default environment\n"
 914 #if defined(CONFIG_CMD_EDITENV)
 915         "env edit name - edit environment variable\n"
 916 #endif
 917         "env export [-t | -b | -c] addr [size] - export environment\n"
 918 #if defined(CONFIG_CMD_GREPENV)
 919         "env grep string [...] - search environment\n"
 920 #endif
 921         "env import [-d] [-t | -b | -c] addr [size] - import environment\n"
 922         "env print [name ...] - print environment\n"
 923 #if defined(CONFIG_CMD_RUN)
 924         "env run var [...] - run commands in an environment variable\n"
 925 #endif
 926         "env save - save environment\n"
 927         "env set [-f] name [arg ...]\n"
 928 );
 929
 930 /*
 931  * Old command line interface, kept for compatibility
 932  */
 933
 934 #if defined(CONFIG_CMD_EDITENV)
 935 U_BOOT_CMD_COMPLETE(
 936         editenv, 2, 0,  do_env_edit,
 937         "edit environment variable",
 938         "name\n"
 939         "    - edit environment variable 'name'",
 940         var_complete
 941 );
 942 #endif
 943
 944 U_BOOT_CMD_COMPLETE(
 945         printenv, CONFIG_SYS_MAXARGS, 1,        do_env_print,
 946         "print environment variables",
 947         "\n    - print values of all environment variables\n"
 948         "printenv name ...\n"
 949         "    - print value of environment variable 'name'",
 950         var_complete
 951 );
 952
 953 #ifdef CONFIG_CMD_GREPENV
 954 U_BOOT_CMD_COMPLETE(
 955         grepenv, CONFIG_SYS_MAXARGS, 0,  do_env_grep,
 956         "search environment variables",
 957         "string ...\n"
 958         "    - list environment name=value pairs matching 'string'",
 959         var_complete
 960 );
 961 #endif
 962
 963 U_BOOT_CMD_COMPLETE(
 964         setenv, CONFIG_SYS_MAXARGS, 0,  do_env_set,
 965         "set environment variables",
 966         "name value ...\n"
 967         "    - set environment variable 'name' to 'value ...'\n"
 968         "setenv name\n"
 969         "    - delete environment variable 'name'",
 970         var_complete
 971 );
 972
 973 #if defined(CONFIG_CMD_ASKENV)
 974
 975 U_BOOT_CMD(
 976         askenv, CONFIG_SYS_MAXARGS,     1,      do_env_ask,
 977         "get environment variables from stdin",
 978         "name [message] [size]\n"
 979         "    - get environment variable 'name' from stdin (max 'size' chars)\n"
 980         "askenv name\n"
 981         "    - get environment variable 'name' from stdin\n"
 982         "askenv name size\n"
 983         "    - get environment variable 'name' from stdin (max 'size' chars)\n"
 984         "askenv name [message] size\n"
 985         "    - display 'message' string and get environment variable 'name'"
 986         "from stdin (max 'size' chars)"
 987 );
 988 #endif
 989
 990 #if defined(CONFIG_CMD_RUN)
 991 U_BOOT_CMD_COMPLETE(
 992         run,    CONFIG_SYS_MAXARGS,     1,      do_run,
 993         "run commands in an environment variable",
 994         "var [...]\n"
 995         "    - run the commands in the environment variable(s) 'var'",
 996         var_complete
 997 );
 998 #endif