[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-835-g8636cc1

[Julien B a. A. <ar...@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  8636cc1e2022cd053c4d9db9b9e5c323e6b44967 (commit)
       via  e66c17a419e718f0719fcf788945389eb5a02b4f (commit)
      from  fb6a99bdaaba369a2aa6396e2cc0029bd00fd476 (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 8636cc1e2022cd053c4d9db9b9e5c323e6b44967
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 10 10:18:18 2015 +0200

    [TOOLS] uboot_recover: APF6: warn user about U-Boot update might be needed after recovery

commit e66c17a419e718f0719fcf788945389eb5a02b4f
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 10 10:16:52 2015 +0200

    [TOOLS] uboot_recover: add 'BLINK' color

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

Summary of changes:
 software/uboot_recover/apf6_recovery.py |    6 +++---
 software/uboot_recover/helpers.py       |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/software/uboot_recover/apf6_recovery.py b/software/uboot_recover/apf6_recovery.py
index 395ec34..885b6f9 100644
--- a/software/uboot_recover/apf6_recovery.py
+++ b/software/uboot_recover/apf6_recovery.py
@@ -92,10 +92,10 @@ if __name__ == "__main__":
     print "Procedure to follow:"
     print "1] Be sure to:"
     print "   * have built the APF6 BSP (make apf6_defconfig; make),"
-    print "   * have \"sb\" tool installed (On Ubuntu: sudo apt-get install lrzsz),"
+    print "   * have \"sb\" tool installed on your PC (on Ubuntu: sudo apt-get install lrzsz),"
     print "   * have launched this script as root (sudo)."
     print "2] Power off your board, close all serial terminal sessions, remove all USB cables"
-    print "3] Take jumper off BOOT0 pin and put it on BOOT1 pin."
+    print "3] Take jumper off BOOT0 pins and put it on BOOT1 pins."
     print "4] Power on your board"
     print "5] Connect a USB cable from your PC to the APF6Dev OTG miniUSB connector"
     print "6] Connect a USB cable from your PC to the APF6Dev console miniUSB connector"
@@ -160,4 +160,4 @@ if __name__ == "__main__":
         sys.exit(1)
     else:
         print color.GREEN + "\n--- U-Boot successfully recovered !" + color.END
-        print color.BOLD + "--- Now you can remove miniUSB OTG cable and put the jumper back on BOOT0 pin. Your board is running..." + color.END
+        print color.BOLD +  "--- Now you can remove the miniUSB OTG cable and put the jumper back on BOOT0 pin. Your board will boot... As the restored U-Boot version may differ from the one your were using, " + color.UNDERLINE + "if you want to maximize the chances to keep your rootfs data safe, we strongly advise you to reflash the same U-Boot version your were using before the recovery. Otherwise (you don't care about your data), please upgrade to the latest available stable Armadeus U-Boot release." + color.END
diff --git a/software/uboot_recover/helpers.py b/software/uboot_recover/helpers.py
index c26a40c..0023f7c 100644
--- a/software/uboot_recover/helpers.py
+++ b/software/uboot_recover/helpers.py
@@ -5,5 +5,6 @@ class color:
    YELLOW = '\033[93m'
    RED = '\033[91m'
    BOLD = '\033[1m'
+   BLINK = '\033[5m'
    UNDERLINE = '\033[4m'
    END = '\033[0m'


hooks/post-receive
-- 
armadeus