diff options
| author | Simon Glass <sjg@chromium.org> | 2013-03-14 06:54:53 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-15 16:13:54 -0400 |
| commit | 3929fb0a141530551b3fce15ee08629f80d5ef2a (patch) | |
| tree | 8c3e31e338afb232ac5e404225304c7285136bf4 /arch/avr32 | |
| parent | 69d59b47ad408d9961b850f23e59a93fdeb71df8 (diff) | |
| download | talos-obmc-uboot-3929fb0a141530551b3fce15ee08629f80d5ef2a.tar.gz talos-obmc-uboot-3929fb0a141530551b3fce15ee08629f80d5ef2a.zip | |
Replace __bss_end__ with __bss_end
Note this is a tree-wide change affecting multiple architectures.
At present we use __bss_start, but mostly __bss_end__. This seems
inconsistent and in a number of places __bss_end is used instead.
Change to use __bss_end for the BSS end symbol throughout U-Boot. This
makes it possible to use the asm-generic/sections.h file on all
archs.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/cpu/start.S | 2 | ||||
| -rw-r--r-- | arch/avr32/cpu/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sections.h | 2 | ||||
| -rw-r--r-- | arch/avr32/lib/board.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S index 71cbc524c9..c8decea127 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, __bss_end__ + lda.w r9, __bss_end sub r9, r8 1: st.d r10++, r0 sub r9, 8 diff --git a/arch/avr32/cpu/u-boot.lds b/arch/avr32/cpu/u-boot.lds index 0b16d2a883..d096424812 100644 --- a/arch/avr32/cpu/u-boot.lds +++ b/arch/avr32/cpu/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - __bss_end__ = .; + __bss_end = .; } diff --git a/arch/avr32/include/asm/sections.h b/arch/avr32/include/asm/sections.h index 3f157888ee..a78fd40bed 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 __bss_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 bd1be73ae4..e828e42326 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -116,7 +116,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)__bss_end__); + (unsigned long)_data, (unsigned long)__bss_end); return 0; } @@ -188,7 +188,7 @@ void board_init_f(ulong board_type) * - stack */ addr = CONFIG_SYS_SDRAM_BASE + sdram_size; - monitor_len = __bss_end__ - _text; + monitor_len = __bss_end - _text; /* * Reserve memory for u-boot code, data and bss. |
