diff options
author | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
commit | c04bf5e9a45d7335681352faa125193258f8e976 (patch) | |
tree | ab512a5a8356b6f492100925acb63638a7c10ce9 /board/hermes | |
parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
download | blackbird-obmc-uboot-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz blackbird-obmc-uboot-c04bf5e9a45d7335681352faa125193258f8e976.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/hermes')
-rw-r--r-- | board/hermes/u-boot.lds | 2 | ||||
-rw-r--r-- | board/hermes/u-boot.lds.debug | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 456140df9f..d50c5865b1 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -96,6 +96,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 7038ebc1dc..8a197deef7 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } |