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/powerpc/cpu/mpc83xx | |
| 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/powerpc/cpu/mpc83xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/u-boot.lds | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 44a64b7..1bfc971 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -76,7 +76,7 @@ START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(__bss_start) - GOT_ENTRY(__bss_end__) + GOT_ENTRY(__bss_end) #ifndef MINIMAL_SPL GOT_ENTRY(_FIXUP_TABLE_) @@ -980,7 +980,7 @@ clear_bss: */ lwz r4,GOT(environment) #else - lwz r4,GOT(__bss_end__) + lwz r4,GOT(__bss_end) #endif cmplw 0, r3, r4 diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds index d140453..870b47d 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds @@ -49,7 +49,7 @@ SECTIONS .bss (NOLOAD) : { *(.*bss) } - __bss_end__ = .; + __bss_end = .; } ENTRY(_start) -ASSERT(__bss_end__ <= 0xfff01000, "NAND bootstrap too big"); +ASSERT(__bss_end <= 0xfff01000, "NAND bootstrap too big"); diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds index d699def..22e92e9 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds @@ -85,7 +85,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } ENTRY(_start) |