diff options
| author | stroese <stroese> | 2003-04-04 15:44:49 +0000 | 
|---|---|---|
| committer | stroese <stroese> | 2003-04-04 15:44:49 +0000 | 
| commit | 0587597ca333f9a5877af7a7d272d5fb5d8070cc (patch) | |
| tree | 73e24de16ce4ccb2e19304a684d629f658518b82 /common/cmd_nvedit.c | |
| parent | 0db5bca8076998a7516102988ac976a2da28d531 (diff) | |
| download | olio-uboot-2014.01-0587597ca333f9a5877af7a7d272d5fb5d8070cc.tar.xz olio-uboot-2014.01-0587597ca333f9a5877af7a7d272d5fb5d8070cc.zip | |
U-Boot version environment variable "ver" added (CONFIG_VERSION_VARIABLE).
Diffstat (limited to 'common/cmd_nvedit.c')
| -rw-r--r-- | common/cmd_nvedit.c | 8 | 
1 files changed, 6 insertions, 2 deletions
| diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index c404157ac..3c2a553ba 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -180,9 +180,13 @@ int _do_setenv (int flag, int argc, char *argv[])  #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 defined(CONFIG_VERSION_VARIABLE) +		     (strcmp (name, "ver") == 0) || +#endif /* CONFIG_VERSION_VARIABLE */  		    ((strcmp (name, "ethaddr") == 0)  #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)  		     && (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0) @@ -358,7 +362,7 @@ int _do_setenv (int flag, int argc, char *argv[])  	}  #endif	/* CFG_CMD_NET */ -#ifdef CONFIG_AMIGAONEG3SE  +#ifdef CONFIG_AMIGAONEG3SE  	if (strcmp(argv[1], "vga_fg_color") == 0 ||  	    strcmp(argv[1], "vga_bg_color") == 0 ) {  		extern void video_set_color(unsigned char attr); |