[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-469-gb93ab00

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b93ab00c3e8d6babed0d78a5fe1d0e5f29f53004 (commit)
      from  8a1b6efda089db36b60a909e77e5c1f9c2a941ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b93ab00c3e8d6babed0d78a5fe1d0e5f29f53004
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Sep 30 16:49:55 2013 +0200

    [TOOLS] apf9328: Fix U-Boot recover tool capabilities to reset env variables - enhance to download U-Boot binary image from our server

-----------------------------------------------------------------------

Summary of changes:
 software/uboot_recover/apf9328_recover.py |   30 ++++++++++++++++++++------
 software/uboot_recover/bootloader.py      |   32 +++++++++++++++-------------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/software/uboot_recover/apf9328_recover.py b/software/uboot_recover/apf9328_recover.py
index 1d5535b..aa6eb45 100644
--- a/software/uboot_recover/apf9328_recover.py
+++ b/software/uboot_recover/apf9328_recover.py
@@ -27,6 +27,22 @@ import serial
 ser = 0 #serial port
 
 if __name__ == "__main__":    
+    RECOVERY_URL = "http://sourceforge.net/projects/armadeus/files/armadeus/"
+    RECOVERY_VERSION = "armadeus-5.2"
+    RECOVERY_BOARD_PATH = "binaries/apf9328/"
+    UBOOT_IMAGE_BIN = "apf9328-u-boot.bin"
+    UBOOT_RECOVERY_PATH = RECOVERY_URL+RECOVERY_VERSION+"/"+RECOVERY_BOARD_PATH+UBOOT_IMAGE_BIN+"/download"
+    if not os.path.exists(UBOOT_IMAGE_BIN):
+        try:
+            print "Downloading " + UBOOT_IMAGE_BIN + ".."
+            os.system("wget -O "+ UBOOT_IMAGE_BIN + " " +UBOOT_RECOVERY_PATH)
+        except Exception, msg:
+            print "Failed to download U-Boot image file from server!"
+            print msg
+            print "Server may be unavailable for the momenet. please try later."
+            os.remove(UBOOT_IMAGE_BIN);
+            sys.exit()
+
     SPEED = 38400
     ramSize = 16
     print "APF Recover Tool"
@@ -43,10 +59,10 @@ if __name__ == "__main__":
 	print msg
         sys.exit()
     ser.flush()
-    apfBootloader = imxlBootloader(ser, ramSize)

-    apfBootloader.sync()

-    eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')

-    apfBootloader.loadFlashbin("apf9328-u-boot.bin", "10000000", eraseAll)

-    print "uBoot successfully recovered !"

-    del ser

-

+    apfBootloader = imxlBootloader(ser, ramSize)
+    apfBootloader.sync()
+    eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
+    apfBootloader.loadFlashbin("apf9328-u-boot.bin", "10000000", eraseAll)
+    print "uBoot successfully recovered !"
+    del ser
+
diff --git a/software/uboot_recover/bootloader.py b/software/uboot_recover/bootloader.py
index 15d0d5e..f7bd214 100644
--- a/software/uboot_recover/bootloader.py
+++ b/software/uboot_recover/bootloader.py
@@ -70,21 +70,21 @@ class imxlBootloader:
             self.put("221000","B10A9267","l")

             self.get("8023000", "4","b")

             self.put("221000","810A9267","l")

-        elif self.ramSize == 32:
-            self.put("221000","911A9267","l")
-            self.get("8400000", "4","b")
-            self.put("221000","A11A9267","l")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.get("8000000", "4","b")
-            self.put("221000","B11A9267","l")
-            self.get("8446000", "4","b")
-            self.put("221000","811A9267","l")
+        elif self.ramSize == 32:

+            self.put("221000","911A9267","l")

+            self.get("8400000", "4","b")

+            self.put("221000","A11A9267","l")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.get("8000000", "4","b")

+            self.put("221000","B11A9267","l")

+            self.get("8446000", "4","b")

+            self.put("221000","811A9267","l")

         else:

             print "Warning ramSize %d not supported" % self.ramSize

     #--------------------------------------------------------------

@@ -175,7 +175,9 @@ class imxlBootloader:
         self.eraseFlashBlock("10020000")

         if eraseAll == 'y':

             self.eraseFlashBlock("10040000")

+            self.eraseFlashBlock("10060000")

             self.eraseFlashBlock("10080000")

+            self.eraseFlashBlock("100A0000")

             self.eraseFlashBlock("10100000")

             self.eraseFlashBlock("10200000")

             self.eraseFlashBlock("10400000")	



hooks/post-receive
-- 
armadeus