[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-237-ge37170d

[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  e37170d0bfd916cee3d691b0013987d2b476375b (commit)
      from  99d49763c8de93cb2c6b6445866ef5fd97b53272 (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 e37170d0bfd916cee3d691b0013987d2b476375b
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Mar 30 17:42:46 2012 +0200

    [TOOLS] apf28: update recovering software and U-Boot binary image

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |    2 +-
 patches/u-boot/2011.12/502-add-apf28.patch         |    6 +++---
 software/uboot_recover/apf28-u-boot-spl            |  Bin 193422 -> 201517 bytes
 software/uboot_recover/apf28-u-boot.sb             |  Bin 420320 -> 405424 bytes
 software/uboot_recover/apf28-u-boot_recover.bd     |    4 ++--
 software/uboot_recover/apf28_recover.py            |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 2f38828..c9e46b1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -120,7 +120,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define	CONFIG_SYS_TEXT_BASE		0x44000000
+#define	CONFIG_SYS_TEXT_BASE		0x40000000
 
 /*
  * FLASH organization
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 6bcec47..21e2e7b 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1350,9 +1350,9 @@
 +	//----------------------------------------------------------
 +	// Load and call U-Boot
 +	//----------------------------------------------------------
-+	load u_boot > 0x44000000;
-+	load ivt (entry = 0x44000000) > 0x8000;
-+	hab call 0x8000;
++	load u_boot > 0x40000000;
++	load ivt (entry = 0x40000000) > 0x8000;
++	hab jump 0x8000;
 +}
 --- u-boot-2011.12/boards.cfg	2011-11-23 21:23:45.000000000 +0100
 +++ u-boot-2011.12/boards.cfg	2011-11-27 11:32:23.174363004 +0100
diff --git a/software/uboot_recover/apf28-u-boot-spl b/software/uboot_recover/apf28-u-boot-spl
index 0936403..ed916ba 100755
Binary files a/software/uboot_recover/apf28-u-boot-spl and b/software/uboot_recover/apf28-u-boot-spl differ
diff --git a/software/uboot_recover/apf28-u-boot.sb b/software/uboot_recover/apf28-u-boot.sb
index f62c5dd..54a712f 100644
Binary files a/software/uboot_recover/apf28-u-boot.sb and b/software/uboot_recover/apf28-u-boot.sb differ
diff --git a/software/uboot_recover/apf28-u-boot_recover.bd b/software/uboot_recover/apf28-u-boot_recover.bd
index 4d53b25..ea8fd7b 100644
--- a/software/uboot_recover/apf28-u-boot_recover.bd
+++ b/software/uboot_recover/apf28-u-boot_recover.bd
@@ -15,6 +15,6 @@ section (0) {
 	//----------------------------------------------------------
 	// Load U-Boot and env script to setup NAND flash
 	//----------------------------------------------------------
-	load u_boot_sb > 0x40000000;
-	load u_boot_env > 0x41000100;
+	load u_boot_sb > 0x41000000;
+	load u_boot_env > 0x42000000;
 }
diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index 67b410c..3d00c89 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -137,7 +137,7 @@ if __name__ == "__main__":
     ELFTOSB_APP = "../../buildroot/output/host/usr/bin/elftosb"
     NAND_BINARY = "apf28_nand_recover.sb"
     ENV_RECOVER = "apf28_env_recover.txt"
-    ENV_DOWNLOAD = 0x41000100
+    ENV_DOWNLOAD = 0x42000000
 
     print "\n--- APF28 Bootstrap Tool ---\n"
     print "Procedure to follow:"
@@ -176,7 +176,7 @@ if __name__ == "__main__":
 
     fsize = "%08x" % os.path.getsize(BINARY)
     envfile = open(ENV_RECOVER, 'w')
-    envfile.write("fileaddr=40000000\n")
+    envfile.write("fileaddr=41000000\n")
     envfile.write("filesize=%s\n" % fsize)
     envfile.close()
     


hooks/post-receive
-- 
armadeus