diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-04-04 09:35:30 (GMT) |
| commit | 1cad23c5f471d695bed1e3907e30caee3c2a3056 (patch) | |
| tree | 34e035df5db9b327aeae36eff9d0645a915e3177 /arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | |
| parent | 5dd73bc0a40a4b318195eab871a1f535aad6b43b (diff) | |
| parent | 00b132bf34c5be86a108ac7fe8231ad9e97f6de4 (diff) | |
| download | u-boot-1cad23c5f471d695bed1e3907e30caee3c2a3056.tar.xz | |
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>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg index e98c97b..bb78cb0 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg +++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg @@ -1,8 +1,8 @@ SECTION 0x0 BOOTABLE TAG LAST - LOAD 0x1000 OBJTREE/spl/u-boot-spl.bin + LOAD 0x1000 spl/u-boot-spl.bin LOAD IVT 0x8000 0x1000 CALL HAB 0x8000 0x0 - LOAD 0x40002000 OBJTREE/u-boot.bin + LOAD 0x40002000 u-boot.bin LOAD IVT 0x8000 0x40002000 CALL HAB 0x8000 0x0 |