projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 9c5d1fcb9059e40b0f01ed29e88d2824e9fa8b3a..70897062a6fb11e03b76f76213d64f0dd16ee320 100644
(file)
--- a/
common/cmd_nvedit.c
+++ b/
common/cmd_nvedit.c
@@
-58,8
+58,9
@@
DECLARE_GLOBAL_DATA_PTR;
!defined(CFG_ENV_IS_IN_DATAFLASH) && \
!defined(CFG_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \
!defined(CFG_ENV_IS_IN_DATAFLASH) && \
!defined(CFG_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \
+ !defined(CFG_ENV_IS_IN_SPI_FLASH) && \
!defined(CFG_ENV_IS_NOWHERE)
!defined(CFG_ENV_IS_NOWHERE)
-# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|NOWHERE}
+# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|
SPI_FLASH|
NOWHERE}
#endif
#define XMK_STR(x) #x
#endif
#define XMK_STR(x) #x
@@
-98,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;
}
return 0;
}
@@
-179,11
+181,12
@@
int _do_setenv (int flag, int argc, char *argv[])
* Ethernet Address and serial# can be set only once,
* ver is readonly.
*/
* Ethernet Address and serial# can be set only once,
* ver is readonly.
*/
+ if (
#ifdef CONFIG_HAS_UID
/* Allow serial# forced overwrite with 0xdeaf4add flag */
#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
#else
-
if (
(strcmp (name, "serial#") == 0) ||
+
(strcmp (name, "serial#") == 0) ||
#endif
((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
#endif
((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
@@
-379,13
+382,13
@@
int _do_setenv (int flag, int argc, char *argv[])
return 0;
}
return 0;
}
-
void
setenv (char *varname, char *varvalue)
+
int
setenv (char *varname, char *varvalue)
{
char *argv[4] = { "setenv", varname, varvalue, NULL };
if (varvalue == NULL)
{
char *argv[4] = { "setenv", varname, varvalue, NULL };
if (varvalue == NULL)
- _do_setenv (0, 2, argv);
+
return
_do_setenv (0, 2, argv);
else
else
- _do_setenv (0, 3, argv);
+
return
_do_setenv (0, 3, argv);
}
#ifdef CONFIG_HAS_UID
}
#ifdef CONFIG_HAS_UID