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/nios2/cpu | |
| parent | 69d59b47ad408d9961b850f23e59a93fdeb71df8 (diff) | |
| download | u-boot-imx-3929fb0a141530551b3fce15ee08629f80d5ef2a.zip u-boot-imx-3929fb0a141530551b3fce15ee08629f80d5ef2a.tar.gz u-boot-imx-3929fb0a141530551b3fce15ee08629f80d5ef2a.tar.bz2 | |
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/nios2/cpu')
| -rw-r--r-- | arch/nios2/cpu/start.S | 6 | ||||
| -rw-r--r-- | arch/nios2/cpu/u-boot.lds | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 0f4ab28..1787b65 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -99,12 +99,12 @@ _cur: movhi r5, %hi(_cur - _start) 3: /* ZERO BSS/SBSS -- bss and sbss are assumed to be adjacent - * and between __bss_start and __bss_end__. + * and between __bss_start and __bss_end. */ movhi r5, %hi(__bss_start) ori r5, r5, %lo(__bss_start) - movhi r6, %hi(__bss_end__) - ori r6, r6, %lo(__bss_end__) + movhi r6, %hi(__bss_end) + ori r6, r6, %lo(__bss_end) beq r5, r6, 5f 4: stwio r0, 0(r5) diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds index d0eb80d..90a7795 100644 --- a/arch/nios2/cpu/u-boot.lds +++ b/arch/nios2/cpu/u-boot.lds @@ -101,7 +101,7 @@ SECTIONS *(.scommon) } . = ALIGN(4); - __bss_end__ = .; + __bss_end = .; PROVIDE (end = .); /* DEBUG -- symbol table, string table, etc. etc. |