[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-214-g4082303

[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  4082303298c456a0e7364e21d9c5d6069df74e1f (commit)
      from  17e21178efce9eaaf8daad54c565f31c398734ce (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 4082303298c456a0e7364e21d9c5d6069df74e1f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 8 17:14:03 2014 +0200

    [UBOOT] 2014.04-rc3: update apf28 patchwork

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2014.04.h   |    1 +
 .../u-boot/2014.04/501-imx28-update-and-fix.patch  |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
index 384840b..8b6facf 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
@@ -10,6 +10,7 @@
 #define CONFIG_ENV_VERSION	11
 #define CONFIG_IDENT_STRING	" apf28 patch 1.5"
 #define CONFIG_BOARD_NAME	apf28
+#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * SoC configurations
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 5c128b4..5245f99 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,12 +22,12 @@ 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        OBJTREE/spl/u-boot-spl.bin
+  LOAD     0x0        spl/u-boot-spl.bin
   LOAD IVT 0x8000     0x14
   CALL HAB 0x8000     0x0
-- LOAD     0x40000100 OBJTREE/u-boot.bin
+- LOAD     0x40000100 u-boot.bin
 - LOAD IVT 0x8000     0x40000100
-+ LOAD     0x40000000 OBJTREE/u-boot.bin
++ LOAD     0x40000000 u-boot.bin
 + LOAD IVT 0x8000     0x40000000
   CALL HAB 0x8000     0x0
 --- a/include/configs/mxs.h


hooks/post-receive
-- 
armadeus