aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorPo-Yu Chuang <ratbert@faraday-tech.com>2011-03-01 22:59:59 +0000
committerAlbert Aribaud <albert.aribaud@free.fr>2011-03-27 19:18:37 +0200
commit44c6e6591cb451ae606f8bde71dd5fb7b4002544 (patch)
treed1fd2c25a1590f9a19a814b1f5d4c61186d8cc86 /arch/arm/cpu/pxa
parent55f7934d2b07a62027cb05484ea3f10666a855d1 (diff)
downloadu-boot-linaro-stable-44c6e6591cb451ae606f8bde71dd5fb7b4002544.tar.gz
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 <ratbert@faraday-tech.com>
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/start.S2
-rw-r--r--arch/arm/cpu/pxa/u-boot.lds2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index d2d391e6d..ca072c474 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 0818d0b6e..dfb9b7753 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*) }