- Fix bug in CONFIG_VERSION_VARIABLE.

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bfc69bdb485b5af6f759c10e11dd699a178e81ef..53df582cfa1829bc188f20b6e50910e4d7bb77b2 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -183,9 +183,6 @@ int _do_setenv (int flag, int argc, char *argv[])
                 * 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)

diff --git a/common/main.c b/common/main.c
index f7830a1f3db0f295722522324f09f815455a5bf4..5ddecca736684cefb2335759632e23bde744c4d9 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -284,10 +284,8 @@ void main_loop (void)
 #ifdef CONFIG_VERSION_VARIABLE
        {
                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 */