summaryrefslogtreecommitdiffstats
path: root/arch/avr32
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/avr32
parent55f7934d2b07a62027cb05484ea3f10666a855d1 (diff)
downloadtalos-obmc-uboot-44c6e6591cb451ae606f8bde71dd5fb7b4002544.tar.gz
talos-obmc-uboot-44c6e6591cb451ae606f8bde71dd5fb7b4002544.zip
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/avr32')
-rw-r--r--arch/avr32/cpu/start.S2
-rw-r--r--arch/avr32/include/asm/sections.h2
-rw-r--r--arch/avr32/lib/board.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S
index 97140e93eb..71cbc524c9 100644
--- a/arch/avr32/cpu/start.S
+++ b/arch/avr32/cpu/start.S
@@ -244,7 +244,7 @@ relocate_code:
/* zero out .bss */
mov r0, 0
mov r1, 0
- lda.w r9, _end
+ lda.w r9, __bss_end__
sub r9, r8
1: st.d r10++, r0
sub r9, 8
diff --git a/arch/avr32/include/asm/sections.h b/arch/avr32/include/asm/sections.h
index fe819b2db6..3f157888ee 100644
--- a/arch/avr32/include/asm/sections.h
+++ b/arch/avr32/include/asm/sections.h
@@ -27,6 +27,6 @@
extern char _text[], _etext[];
extern char _data[], __data_lma[], _edata[], __edata_lma[];
extern char __got_start[], __got_lma[], __got_end[];
-extern char _end[];
+extern char __bss_end__[];
#endif /* __ASM_AVR32_SECTIONS_H */
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 8b56237f18..5edef8fd39 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -118,7 +118,7 @@ static int display_banner (void)
printf ("\n\n%s\n\n", version_string);
printf ("U-Boot code: %08lx -> %08lx data: %08lx -> %08lx\n",
(unsigned long)_text, (unsigned long)_etext,
- (unsigned long)_data, (unsigned long)_end);
+ (unsigned long)_data, (unsigned long)__bss_end__);
return 0;
}
@@ -190,7 +190,7 @@ void board_init_f(ulong board_type)
* - stack
*/
addr = CONFIG_SYS_SDRAM_BASE + sdram_size;
- monitor_len = _end - _text;
+ monitor_len = __bss_end__ - _text;
/*
* Reserve memory for u-boot code, data and bss.
OpenPOWER on IntegriCloud