Fix setting of environment variable "ver" on trab board

The environment variable "ver" is now set before
do_auto_update() is called, so that "ver" can be used
in USB update scripts.
Patch by Martin Krause, 27 Oct 2005

diff --git a/CHANGELOG b/CHANGELOG
index a79ec5314c0bb737f22f89f5d4b14484a828bfe9..83069fe5f120ca8fe6f6325d4fc4b850fac1ee64 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix setting of environment variable "ver" on trab board
+  The environment variable "ver" is now set before
+  do_auto_update() is called, so that "ver" can be used
+  in USB update scripts.
+  Patch by Martin Krause, 27 Oct 2005
+
 * Fix wrong usage of udelay() in led_blink() on trab board
   Patch by Martin Krause, 27 Oct 2005
 

diff --git a/board/trab/trab.c b/board/trab/trab.c
index 868a899ee90e0002f204b68a306a26407837a222..346406eaad41195415756977789cbf1450c3dbb9 100644 (file)
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -161,6 +161,19 @@ int misc_init_r (void)
        uchar *str;
        int i;
 
+#ifdef CONFIG_VERSION_VARIABLE
+       {
+               /* Set version variable. Please note, that this variable is
+                * also set in main_loop() later in the boot process. The
+                * version variable has to be set this early, because so it
+                * could be used in script files on an usb stick, which
+                * might be called during do_auto_update() */
+               extern char version_string[];
+
+               setenv ("ver", version_string);
+       }
+#endif /* CONFIG_VERSION_VARIABLE */
+
 #ifdef CONFIG_AUTO_UPDATE
        extern int do_auto_update(void);
        /* this has priority over all else */