[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-205-g87d15fc

[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  87d15fcd0d6ea619340539f1d91e880f09308840 (commit)
      from  366a6115f830fb73e86bf63271fd58c80b8341ed (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 87d15fcd0d6ea619340539f1d91e880f09308840
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 27 14:32:25 2012 +0200

    [TOOLS] update apf27 uboot recover tool

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

Summary of changes:
 software/uboot_recover/apf27-u-boot.bin |  Bin 226016 -> 372288 bytes
 software/uboot_recover/apf27_recover.py |   12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
index 74d6891..e9c202d 100644
Binary files a/software/uboot_recover/apf27-u-boot.bin and b/software/uboot_recover/apf27-u-boot.bin differ
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 30500d6..4663ec5 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -118,7 +118,7 @@ class apf27Bootloader:
     def __displayProgress(self, text):
         sys.stdout.write(chr(13))
         print text,
-	sys.stdout.flush()
+        sys.stdout.flush()
 
 # addr: address to read
 # count: number of bytes to read 
@@ -331,16 +331,20 @@ class UBoot:
         self.bootstrap.download("A0000000", BINARY, fsize)
 
     def resetenv(self):
+        self.serial.flushInput()
         self.serial.write("run flash_reset_env\n")
         return self.__getOutput()
 
     def waitForPrompt(self):
-        time.sleep(1)
-        self.serial.write("\n")
+        #time.sleep(1)
+        self.serial.write("\003")
+        while not self.serial.inWaiting():
+            self.serial.write("\003")
         return self.__getOutput()
 
     def flash(self):
         """ flash uboot """
+        self.serial.flushInput()
         self.serial.write("run flash_uboot\n")
         try:
             ret = self.__getOutput()
@@ -365,7 +369,7 @@ if __name__ == "__main__":
         ser = serial.Serial(port, SPEED, timeout=3) 
     except Exception, msg:
         print "unable to open serial port %s" % port
-	print msg
+        print msg
         sys.exit()
     ser.flush()
 


hooks/post-receive
-- 
armadeus