sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

- Fix bug in CONFIG_VERSION_VARIABLE.

This commit is contained in:
stroese 2003-07-11 08:00:33 +00:00
parent f12e568ca4
commit 155cb0104a
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/cmd_nvedit.c
View File

@ -183,9 +183,6 @@ int _do_setenv (int flag, int argc, char *argv[])
* ver is readonly. * ver is readonly.
*/ */
if ( (strcmp (name, "serial#") == 0) || if ( (strcmp (name, "serial#") == 0) ||
#if defined(CONFIG_VERSION_VARIABLE)
(strcmp (name, "ver") == 0) ||
#endif /* CONFIG_VERSION_VARIABLE */
((strcmp (name, "ethaddr") == 0) ((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR) #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
&& (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0) && (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)

4
common/main.c
View File

@ -284,10 +284,8 @@ void main_loop (void)
#ifdef CONFIG_VERSION_VARIABLE #ifdef CONFIG_VERSION_VARIABLE
{ {
extern char version_string[]; extern char version_string[];
char *str = getenv("ver");
if (!str) setenv ("ver", version_string); /* set version variable */
setenv ("ver", version_string); /* set version variable */
} }
#endif /* CONFIG_VERSION_VARIABLE */ #endif /* CONFIG_VERSION_VARIABLE */