projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot
[platform/kernel/u-boot.git]
/
common
/
cmd_nvedit.c
diff --git
a/common/cmd_nvedit.c
b/common/cmd_nvedit.c
index
1babffe
..
de5a514
100644
(file)
--- a/
common/cmd_nvedit.c
+++ b/
common/cmd_nvedit.c
@@
-46,10
+46,12
@@
#include <serial.h>
#include <linux/stddef.h>
#include <asm/byteorder.h>
#include <serial.h>
#include <linux/stddef.h>
#include <asm/byteorder.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
#include <net.h>
#endif
#include <net.h>
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
#if !defined(CFG_ENV_IS_IN_NVRAM) && \
!defined(CFG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \
#if !defined(CFG_ENV_IS_IN_NVRAM) && \
!defined(CFG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \
@@
-152,8
+154,6
@@
int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
int _do_setenv (int flag, int argc, char *argv[])
{
int _do_setenv (int flag, int argc, char *argv[])
{
- DECLARE_GLOBAL_DATA_PTR;
-
int i, len, oldval;
int console = -1;
uchar *env, *nxt = NULL;
int i, len, oldval;
int console = -1;
uchar *env, *nxt = NULL;
@@
-167,6
+167,11
@@
int _do_setenv (int flag, int argc, char *argv[])
name = argv[1];
name = argv[1];
+ if (strchr(name, '=')) {
+ printf ("## Error: illegal character '=' in variable name \"%s\"\n", name);
+ return 1;
+ }
+
/*
* search if variable with this name already exists
*/
/*
* search if variable with this name already exists
*/
@@
-243,7
+248,7
@@
int _do_setenv (int flag, int argc, char *argv[])
baudrate);
udelay(50000);
gd->baudrate = baudrate;
baudrate);
udelay(50000);
gd->baudrate = baudrate;
-#if
def CONFIG_PPC
+#if
defined(CONFIG_PPC) || defined(CONFIG_MCF52x2)
gd->bd->bi_baudrate = baudrate;
#endif
gd->bd->bi_baudrate = baudrate;
#endif
@@
-362,12
+367,12
@@
int _do_setenv (int flag, int argc, char *argv[])
load_addr = simple_strtoul(argv[2], NULL, 16);
return 0;
}
load_addr = simple_strtoul(argv[2], NULL, 16);
return 0;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
if (strcmp(argv[1],"bootfile") == 0) {
copy_filename (BootFile, argv[2], sizeof(BootFile));
return 0;
}
if (strcmp(argv[1],"bootfile") == 0) {
copy_filename (BootFile, argv[2], sizeof(BootFile));
return 0;
}
-#endif
/* CFG_CMD_NET */
+#endif
#ifdef CONFIG_AMIGAONEG3SE
if (strcmp(argv[1], "vga_fg_color") == 0 ||
#ifdef CONFIG_AMIGAONEG3SE
if (strcmp(argv[1], "vga_fg_color") == 0 ||
@@
-386,7
+391,10
@@
int _do_setenv (int flag, int argc, char *argv[])
void setenv (char *varname, char *varvalue)
{
char *argv[4] = { "setenv", varname, varvalue, NULL };
void setenv (char *varname, char *varvalue)
{
char *argv[4] = { "setenv", varname, varvalue, NULL };
- _do_setenv (0, 3, argv);
+ if (varvalue == NULL)
+ _do_setenv (0, 2, argv);
+ else
+ _do_setenv (0, 3, argv);
}
int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@
-403,7
+411,7
@@
int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
* Prompt for environment variable
*/
* Prompt for environment variable
*/
-#if
(CONFIG_COMMANDS & CF
G_CMD_ASKENV)
+#if
defined(CONFI
G_CMD_ASKENV)
int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern char console_buffer[CFG_CBSIZE];
int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern char console_buffer[CFG_CBSIZE];
@@
-475,7
+483,7
@@
int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* Continue calling setenv code */
return _do_setenv (flag, len, local_args);
}
/* Continue calling setenv code */
return _do_setenv (flag, len, local_args);
}
-#endif
/* CFG_CMD_ASKENV */
+#endif
/************************************************************************
* Look up variable from environment,
/************************************************************************
* Look up variable from environment,
@@
-530,9
+538,9
@@
int getenv_r (char *name, char *buf, unsigned len)
return (-1);
}
return (-1);
}
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM)
||
\
-
((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) ==
\
-
(CFG_CMD_ENV|CFG_CMD_FLASH
))
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
+
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH))
\
+
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND
))
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern char * env_name_spec;
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
extern char * env_name_spec;
@@
-542,7
+550,6
@@
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return (saveenv() ? 1 : 0);
}
return (saveenv() ? 1 : 0);
}
-
#endif
#endif
@@
-586,18
+593,18
@@
U_BOOT_CMD(
" - delete environment variable 'name'\n"
);
" - delete environment variable 'name'\n"
);
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM)
||
\
-
((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) ==
\
-
(CFG_CMD_ENV|CFG_CMD_FLASH
))
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
+
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH))
\
+
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND
))
U_BOOT_CMD(
saveenv, 1, 0, do_saveenv,
"saveenv - save environment variables to persistent storage\n",
NULL
);
U_BOOT_CMD(
saveenv, 1, 0, do_saveenv,
"saveenv - save environment variables to persistent storage\n",
NULL
);
-#endif
/* CFG_CMD_ENV */
+#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_ASKENV)
+#if
defined(CONFI
G_CMD_ASKENV)
U_BOOT_CMD(
askenv, CFG_MAXARGS, 1, do_askenv,
U_BOOT_CMD(
askenv, CFG_MAXARGS, 1, do_askenv,
@@
-612,9
+619,9
@@
U_BOOT_CMD(
" - display 'message' string and get environment variable 'name'"
"from stdin (max 'size' chars)\n"
);
" - display 'message' string and get environment variable 'name'"
"from stdin (max 'size' chars)\n"
);
-#endif
/* CFG_CMD_ASKENV */
+#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_RUN)
+#if
defined(CONFI
G_CMD_RUN)
int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
U_BOOT_CMD(
run, CFG_MAXARGS, 1, do_run,
int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
U_BOOT_CMD(
run, CFG_MAXARGS, 1, do_run,
@@
-622,4
+629,4
@@
U_BOOT_CMD(
"var [...]\n"
" - run the commands in the environment variable(s) 'var'\n"
);
"var [...]\n"
" - run the commands in the environment variable(s) 'var'\n"
);
-#endif
/* CFG_CMD_RUN */
+#endif