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 /arch/arm/cpu/arm1136 | |
| parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
| parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
| download | u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.zip u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm1136')
| -rw-r--r-- | arch/arm/cpu/arm1136/start.S | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm1136/u-boot.lds | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index a05d36d..3c5f3ef 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -102,6 +102,10 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: + .word __bss_end__ - _start + +.globl _end_ofs +_end_ofs: .word _end - _start #ifdef CONFIG_USE_IRQ diff --git a/arch/arm/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds index 253adbe..d1e2851 100644 --- a/arch/arm/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -72,11 +72,13 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } |