* Code cleanup:

[karo-tx-uboot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 08e888c08e351ee9f3657b946b1b4cc25a27c1f8..9cf8b9041043e213b6274491e4285ed06642e7e9 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -42,7 +42,7 @@
 #include <common.h>
 #include <command.h>
 #include <environment.h>
-#include <cmd_nvedit.h>
+#include <watchdog.h>
 #include <linux/stddef.h>
 #include <asm/byteorder.h>
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
@@ -179,9 +179,13 @@ int _do_setenv (int flag, int argc, char *argv[])
 #ifndef CONFIG_ENV_OVERWRITE
 
                /*
-                * Ethernet Address and serial# can be set only once
+                * Ethernet Address and serial# can be set only once,
+                * ver is readonly.
                 */
                if ( (strcmp (name, "serial#") == 0) ||
+#if defined(CONFIG_VERSION_VARIABLE)
+                    (strcmp (name, "ver") == 0) ||
+#endif /* CONFIG_VERSION_VARIABLE */
                    ((strcmp (name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
                     && (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
@@ -231,6 +235,10 @@ int _do_setenv (int flag, int argc, char *argv[])
                                baudrate);
                        udelay(50000);
                        gd->baudrate = baudrate;
+#ifdef CONFIG_PPC
+                       gd->bd->bi_baudrate = baudrate;
+#endif
+
                        serial_setbrg ();
                        udelay(50000);
                        for (;;) {
@@ -352,6 +360,18 @@ int _do_setenv (int flag, int argc, char *argv[])
                return 0;
        }
 #endif /* CFG_CMD_NET */
+
+#ifdef CONFIG_AMIGAONEG3SE
+       if (strcmp(argv[1], "vga_fg_color") == 0 ||
+           strcmp(argv[1], "vga_bg_color") == 0 ) {
+               extern void video_set_color(unsigned char attr);
+               extern unsigned char video_get_attr(void);
+
+               video_set_color(video_get_attr());
+               return 0;
+       }
+#endif /* CONFIG_AMIGAONEG3SE */
+
        return 0;
 }
 
@@ -459,6 +479,8 @@ char *getenv (uchar *name)
 {
        int i, nxt;
 
+       WATCHDOG_RESET();
+
        for (i=0; env_get_char(i) != '\0'; i=nxt+1) {
                int val;
 
@@ -511,6 +533,8 @@ int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        return (saveenv() ? 1 : 0);
 }
+
+
 #endif
 
 
@@ -533,3 +557,60 @@ envmatch (uchar *s1, int i2)
                return(i2);
        return(-1);
 }
+
+
+/**************************************************/
+
+cmd_tbl_t U_BOOT_CMD(PRINTENV) = MK_CMD_ENTRY(
+       "printenv", CFG_MAXARGS, 1,     do_printenv,
+       "printenv- print environment variables\n",
+       "\n    - print values of all environment variables\n"
+       "printenv name ...\n"
+       "    - print value of environment variable 'name'\n"
+);
+
+cmd_tbl_t U_BOOT_CMD(SETENV) = MK_CMD_ENTRY(
+       "setenv", CFG_MAXARGS, 0,       do_setenv,
+       "setenv  - set environment variables\n",
+       "name value ...\n"
+       "    - set environment variable 'name' to 'value ...'\n"
+       "setenv name\n"
+       "    - delete environment variable 'name'\n"
+);
+
+#if ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH))
+
+cmd_tbl_t U_BOOT_CMD(SAVEENV) = MK_CMD_ENTRY(
+       "saveenv", 1, 0,        do_saveenv,
+       "saveenv - save environment variables to persistent storage\n",
+       NULL
+);
+
+#endif /* CFG_CMD_ENV */
+
+#if (CONFIG_COMMANDS & CFG_CMD_ASKENV)
+
+cmd_tbl_t U_BOOT_CMD(ASKENV) = MK_CMD_ENTRY(
+       "askenv",       CFG_MAXARGS,    1,      do_askenv,
+       "askenv  - get environment variables from stdin\n",
+       "name [message] [size]\n"
+       "    - get environment variable 'name' from stdin (max 'size' chars)\n"
+       "askenv name\n"
+       "    - get environment variable 'name' from stdin\n"
+       "askenv name size\n"
+       "    - get environment variable 'name' from stdin (max 'size' chars)\n"
+       "askenv name [message] size\n"
+       "    - display 'message' string and get environment variable 'name'"
+       "from stdin (max 'size' chars)\n"
+);
+#endif /* CFG_CMD_ASKENV */
+
+#if (CONFIG_COMMANDS & CFG_CMD_RUN)
+int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+cmd_tbl_t U_BOOT_CMD(RUN) = MK_CMD_ENTRY(
+       "run",  CFG_MAXARGS,    1,      do_run,
+       "run     - run commands in an environment variable\n",
+       "var [...]\n"
+       "    - run the commands in the environment variable(s) 'var'\n"
+);
+#endif  /* CFG_CMD_RUN */