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/avr32 | |
parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/cpu/start.S | 2 | ||||
-rw-r--r-- | arch/avr32/include/asm/sections.h | 2 | ||||
-rw-r--r-- | arch/avr32/lib/board.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S index 97140e93ebb..71cbc524c90 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 fe819b2db6e..3f157888ee8 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 8b56237f189..5edef8fd398 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. |