From: Stefano Babic <sbabic@denx.de>
Date: Fri, 4 Apr 2014 09:35:30 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm into master
X-Git-Tag: v2014.04~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1cad23c5f471d695bed1e3907e30caee3c2a3056;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-arm into master

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
---

1cad23c5f471d695bed1e3907e30caee3c2a3056
diff --cc arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
index 70abfbc2e5,811876736c..55510e9cd8
--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
@@@ -1,6 -1,6 +1,6 @@@
  SECTION 0x0 BOOTABLE
   TAG LAST
-  LOAD     0x1000     OBJTREE/spl/u-boot-spl.bin
 - LOAD     0x0        spl/u-boot-spl.bin
 - CALL     0x14       0x0
 - LOAD     0x40000100 u-boot.bin
 - CALL     0x40000100 0x0
++ LOAD     0x1000     spl/u-boot-spl.bin
 + CALL     0x1000     0x0
-  LOAD     0x40002000 OBJTREE/u-boot.bin
++ LOAD     0x40002000 u-boot.bin
 + CALL     0x40002000 0x0
diff --cc arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
index e98c97b63b,ea772f0c86..bb78cb0c84
--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
@@@ -1,8 -1,8 +1,8 @@@
  SECTION 0x0 BOOTABLE
   TAG LAST
-  LOAD     0x1000     OBJTREE/spl/u-boot-spl.bin
 - 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     0x40002000 OBJTREE/u-boot.bin
 - LOAD     0x40000100 u-boot.bin
 - LOAD IVT 0x8000     0x40000100
++ LOAD     0x40002000 u-boot.bin
 + LOAD IVT 0x8000     0x40002000
   CALL HAB 0x8000     0x0