[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-396-gaaa703d

[Sébastien S. <ss...@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  aaa703d34a4bdf4110ef1a55bb5b2f930ef360ee (commit)
      from  67d56d2d5fbdd12f5dffe452c650af576449f41d (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 aaa703d34a4bdf4110ef1a55bb5b2f930ef360ee
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Apr 5 16:09:20 2018 +0200

    [TOOLS] add opos6ulnano recovery support

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

Summary of changes:
 software/uboot_recover/opos6ulnano-u-boot.img         | Bin 0 -> 383357 bytes
 software/uboot_recover/opos6ulnano-u-boot.spl         | Bin 0 -> 35840 bytes
 .../{opos6ul_recovery.py => opos6ulnano_recovery.py}  |  18 +++++++++---------
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 software/uboot_recover/opos6ulnano-u-boot.img
 create mode 100644 software/uboot_recover/opos6ulnano-u-boot.spl
 copy software/uboot_recover/{opos6ul_recovery.py => opos6ulnano_recovery.py} (85%)

diff --git a/software/uboot_recover/opos6ulnano-u-boot.img b/software/uboot_recover/opos6ulnano-u-boot.img
new file mode 100644
index 0000000..169f8de
Binary files /dev/null and b/software/uboot_recover/opos6ulnano-u-boot.img differ
diff --git a/software/uboot_recover/opos6ulnano-u-boot.spl b/software/uboot_recover/opos6ulnano-u-boot.spl
new file mode 100644
index 0000000..9e7b40d
Binary files /dev/null and b/software/uboot_recover/opos6ulnano-u-boot.spl differ
diff --git a/software/uboot_recover/opos6ul_recovery.py b/software/uboot_recover/opos6ulnano_recovery.py
similarity index 85%
copy from software/uboot_recover/opos6ul_recovery.py
copy to software/uboot_recover/opos6ulnano_recovery.py
index aa91e22..381af1f 100644
--- a/software/uboot_recover/opos6ul_recovery.py
+++ b/software/uboot_recover/opos6ulnano_recovery.py
@@ -1,7 +1,7 @@
 #
-#  OPOS6UL bootloader recovering tool
+#  OPOS6ULNano bootloader recovering tool
 #
-#  Copyright (C) 2014 Armadeus Project
+#  Copyright (C) 2018 Armadeus Project
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -84,18 +84,18 @@ if __name__ == "__main__":
     BR_IMAGES_PATH = "../../buildroot/output/images"
     USB_DOWNLOAD_APP = BR_HOST_PATH + "/usr/bin/imx_usb"
     SERIAL_DOWNLOAD_APP = "sb"
-    U_BOOT_SPL = "opos6ul-u-boot.spl"
-    U_BOOT_IMG = "opos6ul-u-boot.img"
+    U_BOOT_SPL = "opos6ulnano-u-boot.spl"
+    U_BOOT_IMG = "opos6ulnano-u-boot.img"
     SPEED = 115200
 
-    print color.BOLD + "\n--- OPOS6UL Bootstrap Tool ---\n"
+    print color.BOLD + "\n--- OPOS6ULNano Bootstrap Tool ---\n"
     print "Procedure to follow:"
     print "1] Be sure to:"
-    print "   * have built the OPOS6UL BSP (make opos6ul_defconfig; make),"
+    print "   * have built the OPOS6ULNano BSP (make opos6ulnano_defconfig; make),"
     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 BOOT1 pins (if any) and put a jumper on BOOT0 pins."
+    print "3] Sold a 3v3 on J5. See the OPOS6ULNano wiki page for more details"
     print "4] Power on your board"
     print "5] Connect a USB cable from your PC to the OPOS6ULDev OTG miniUSB connector"
     print "6] Connect a USB cable from your PC to the OPOS6ULDev console/debug miniUSB connector"
@@ -105,7 +105,7 @@ if __name__ == "__main__":
         port = '/dev/ttyUSB0'
 
     if not os.path.exists(USB_DOWNLOAD_APP):
-        print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make opos6ul_defconfig; make"  + color.END
+        print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make opos6ulnano_defconfig; make"  + color.END
         sys.exit(1)
 
     if not os.path.exists(U_BOOT_SPL) or not os.path.exists(U_BOOT_IMG):
@@ -161,4 +161,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 the miniUSB OTG cable and the jumper on BOOT0 pins. 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
+        print color.BOLD +  "--- Now you can remove the miniUSB OTG cable and unsold the wire. 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


hooks/post-receive
-- 
armadeus