[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-240-g0a40a81

[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  0a40a8183de15b685842f2083fdc2fd0907c2e7b (commit)
      from  37a915c3ea610f154512436300d3620af8c04578 (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 0a40a8183de15b685842f2083fdc2fd0907c2e7b
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Apr 28 17:40:27 2014 +0200

    [UBOOT] 2014.04: update apf28 patch

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

Summary of changes:
 .../u-boot/2014.04/501-imx28-update-and-fix.patch  |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
index 5245f99..aaae42b 100644
--- a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
@@ -22,26 +22,26 @@ index c60615a..f533ad0 100644
 --- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
 +++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
 @@ -3,6 +3,6 @@ SECTION 0x0 BOOTABLE
-  LOAD     0x0        spl/u-boot-spl.bin
-  LOAD IVT 0x8000     0x14
+  LOAD     0x1000     spl/u-boot-spl.bin
+  LOAD IVT 0x8000     0x1000
   CALL HAB 0x8000     0x0
-- LOAD     0x40000100 u-boot.bin
-- LOAD IVT 0x8000     0x40000100
+- LOAD     0x40002000 u-boot.bin
+- LOAD IVT 0x8000     0x40002000
 + LOAD     0x40000000 u-boot.bin
 + LOAD IVT 0x8000     0x40000000
   CALL HAB 0x8000     0x0
 --- a/include/configs/mxs.h
 +++ b/include/configs/mxs.h
-@@ -81,7 +81,9 @@
-  * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
-  * binary. In case there was more of this mess, 0x100 bytes are skipped.
+@@ -88,7 +88,9 @@
+  * As for the SPL, we must avoid the first 4 KiB as well, but we load the
+  * IVT and CST to 0x8000, so we don't need to waste the subsequent 4 KiB.
   */
 +#ifndef CONFIG_SYS_TEXT_BASE
- #define CONFIG_SYS_TEXT_BASE		0x40000100
+ #define CONFIG_SYS_TEXT_BASE		0x40002000
 +#endif
+ #define CONFIG_SPL_TEXT_BASE		0x00001000
  
  /* U-Boot general configuration */
- #define CONFIG_SYS_LONGHELP
 diff --git a/common/memsize.c b/common/memsize.c
 index 963e4f3..a9f76bc 100644
 --- a/common/memsize.c


hooks/post-receive
-- 
armadeus