[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-478-g53de875

[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  53de875f7e20be1fcbb1e2a824c89e803331c261 (commit)
       via  1427fe5a0b62fa5f803c8b6702ada7d380ed57d5 (commit)
      from  20203901d65cb89087d64815beb983853a1214dd (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 53de875f7e20be1fcbb1e2a824c89e803331c261
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 2 14:15:42 2013 +0200

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

commit 1427fe5a0b62fa5f803c8b6702ada7d380ed57d5
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 2 14:13:44 2013 +0200

    [UBOOT] apf51: 2013.04: make it compatible with recover tool

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

Summary of changes:
 patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch |    2 +-
 software/uboot_recover/apf51_recover.py            |   30 ++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
index db96176..691d359 100644
--- a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
@@ -17,7 +17,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  
  $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
 -	(echo -ne '\x00\x00\x00\x00\x46\x43\x42\x20\x01' && \
-+	(echo -ne '\xFE\x0F\x00\xEA\x46\x43\x42\x20\x01' && \
++	(echo -ne '\xFE\x0F\x00\xEA\xFD\x0F\x00\xEA\x01' && \
  			dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | \
  		cat - $< > $(OBJTREE)/spl/u-boot-nand-spl.imx
  	$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index f56430d..fb7e7b5 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -428,7 +428,7 @@ class UBoot:
  
     def resetEnv(self):
         self.serial.flushInput()
-        self.serial.write("run flash_reset_env\n")
+        self.serial.write("env default -f && saveenv && echo Flash environment variables erased!\n")
         return self.__getOutput()
 
     def waitForPrompt(self):
@@ -523,9 +523,23 @@ if __name__ == "__main__":
         apfBootloader.get("9000001C", "4", "l")
         apfBootloader.get("90000024", "4", "l")
 
+    RECOVERY_URL = "http://sourceforge.net/projects/armadeus/files/armadeus/"
+    RECOVERY_VERSION = "armadeus-5.2"
+    RECOVERY_BOARD_PATH = "binaries/apf51/"
+    UBOOT_IMAGE_BIN = "apf51-u-boot-nand.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 = 115200
-    BINARY = "apf51-u-boot-nand.bin"
 
     print "\n--- APF51 Bootstrap Tool ---\n"
     print "Procedure to follow:"
@@ -534,7 +548,7 @@ if __name__ == "__main__":
     print "3] Power on your board"
     print "4] Connect a USB cable from your PC to the APF51Dev OTG miniUSB connector"
     print "5] Connect a USB cable from your PC to the APF51Dev console miniUSB connector"
-    print "(be sure to have a %s image in current dir too)\n" % BINARY
+    print "(be sure to have a %s image in current dir too)\n" % UBOOT_IMAGE_BIN
     port = raw_input('--- Enter serial port number or name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
     if port is '':
         port = '/dev/ttyACM0'
@@ -567,11 +581,11 @@ if __name__ == "__main__":
     #testRAM()
 
     print "--- Successfully initialized APF51, now loading U-Boot"
-    if not os.path.exists(BINARY):
-        raise Error("file "+BINARY+" doesn't exit",0)
-    fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
-    print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
-    apfBootloader.download("90000000", BINARY, fsize, "AA")
+    if not os.path.exists(UBOOT_IMAGE_BIN):
+        raise Error("file "+UBOOT_IMAGE_BIN+" doesn't exit",0)
+    fsize = "%08x" % os.path.getsize(UBOOT_IMAGE_BIN) #os.stat(filesize)[6]
+    print "Loading %s, size = %d bytes" % (UBOOT_IMAGE_BIN, os.path.getsize(UBOOT_IMAGE_BIN))
+    apfBootloader.download("90000000", UBOOT_IMAGE_BIN, fsize, "AA")
 
     # execute loaded code:
     apfBootloader.put("90000000", "90000004", "l")


hooks/post-receive
-- 
armadeus