Commit 0587597c authored by stroese's avatar stroese
Browse files

U-Boot version environment variable "ver" added (CONFIG_VERSION_VARIABLE).

parent 0db5bca8
...@@ -180,9 +180,13 @@ int _do_setenv (int flag, int argc, char *argv[]) ...@@ -180,9 +180,13 @@ int _do_setenv (int flag, int argc, char *argv[])
#ifndef CONFIG_ENV_OVERWRITE #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 ( (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)
...@@ -358,7 +362,7 @@ int _do_setenv (int flag, int argc, char *argv[]) ...@@ -358,7 +362,7 @@ int _do_setenv (int flag, int argc, char *argv[])
} }
#endif /* CFG_CMD_NET */ #endif /* CFG_CMD_NET */
#ifdef CONFIG_AMIGAONEG3SE #ifdef CONFIG_AMIGAONEG3SE
if (strcmp(argv[1], "vga_fg_color") == 0 || if (strcmp(argv[1], "vga_fg_color") == 0 ||
strcmp(argv[1], "vga_bg_color") == 0 ) { strcmp(argv[1], "vga_bg_color") == 0 ) {
extern void video_set_color(unsigned char attr); extern void video_set_color(unsigned char attr);
......
...@@ -279,6 +279,16 @@ void main_loop (void) ...@@ -279,6 +279,16 @@ void main_loop (void)
} }
#endif /* CONFIG_MODEM_SUPPORT */ #endif /* CONFIG_MODEM_SUPPORT */
#ifdef CONFIG_VERSION_VARIABLE
{
extern char version_string[];
char *str = getenv("ver");
if (!str)
setenv ("ver", version_string); /* set version variable */
}
#endif /* CONFIG_VERSION_VARIABLE */
#ifdef CFG_HUSH_PARSER #ifdef CFG_HUSH_PARSER
u_boot_hush_start (); u_boot_hush_start ();
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment