From 44c6e6591cb451ae606f8bde71dd5fb7b4002544 Mon Sep 17 00:00:00 2001 From: Po-Yu Chuang Date: Tue, 1 Mar 2011 22:59:59 +0000 Subject: rename _end to __bss_end__ Currently, _end is used for end of BSS section. We want _end to mean end of u-boot image, so we rename _end to __bss_end__ first. Signed-off-by: Po-Yu Chuang --- arch/arm/cpu/pxa/start.S | 2 +- arch/arm/cpu/pxa/u-boot.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/cpu/pxa') diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index d2d391e6d2..ca072c4744 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -104,7 +104,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds index 0818d0b6ea..dfb9b77535 100644 --- a/arch/arm/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } -- cgit v1.2.1