diff options
| author | Po-Yu Chuang <ratbert@faraday-tech.com> | 2011-03-01 22:59:59 +0000 |
|---|---|---|
| committer | Albert Aribaud <albert.aribaud@free.fr> | 2011-03-27 19:18:37 +0200 |
| commit | 44c6e6591cb451ae606f8bde71dd5fb7b4002544 (patch) | |
| tree | d1fd2c25a1590f9a19a814b1f5d4c61186d8cc86 /arch/powerpc/cpu/ppc4xx | |
| parent | 55f7934d2b07a62027cb05484ea3f10666a855d1 (diff) | |
| download | blackbird-obmc-uboot-44c6e6591cb451ae606f8bde71dd5fb7b4002544.tar.gz blackbird-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/powerpc/cpu/ppc4xx')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/start.S | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 2218508388..b43e22c8f0 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -248,7 +248,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT #endif /* CONFIG_NAND_SPL */ @@ -1624,7 +1624,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 7f diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds index 656f59a582..2466b79594 100644 --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -140,6 +140,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } |
