diff options
author | Tom Rini <trini@ti.com> | 2014-02-26 21:49:58 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-26 21:49:58 (GMT) |
commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch) | |
tree | edea4b04062ec956158c163b13c9a31fcfdccde8 /board/freescale | |
parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
download | u-boot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/freescale')
-rw-r--r-- | board/freescale/mx31ads/u-boot.lds | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 1cca176..6da1d4b 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -69,7 +69,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c @@ -90,7 +95,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) } |