85xx: Add some L1/L2 SPR register definitions

[oweals/u-boot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 49f134a92e51eb797be0eada8429870905fe59e0..70897062a6fb11e03b76f76213d64f0dd16ee320 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -99,7 +99,8 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                }
 
-               printf("\nEnvironment size: %d/%d bytes\n", i, ENV_SIZE);
+               printf("\nEnvironment size: %d/%ld bytes\n",
+                       i, (ulong)ENV_SIZE);
 
                return 0;
        }
@@ -180,11 +181,12 @@ int _do_setenv (int flag, int argc, char *argv[])
                 * Ethernet Address and serial# can be set only once,
                 * ver is readonly.
                 */
+               if (
 #ifdef CONFIG_HAS_UID
                /* Allow serial# forced overwrite with 0xdeaf4add flag */
-               if ( ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
+                   ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
 #else
-               if ( (strcmp (name, "serial#") == 0) ||
+                   (strcmp (name, "serial#") == 0) ||
 #endif
                    ((strcmp (name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
@@ -380,13 +382,13 @@ int _do_setenv (int flag, int argc, char *argv[])
        return 0;
 }
 
-void setenv (char *varname, char *varvalue)
+int setenv (char *varname, char *varvalue)
 {
        char *argv[4] = { "setenv", varname, varvalue, NULL };
        if (varvalue == NULL)
-               _do_setenv (0, 2, argv);
+               return _do_setenv (0, 2, argv);
        else
-               _do_setenv (0, 3, argv);
+               return _do_setenv (0, 3, argv);
 }
 
 #ifdef CONFIG_HAS_UID