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/powerpc/cpu/mpc85xx | |
| parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
| parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
| download | u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.zip u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index fa98af6..5777493 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -66,7 +66,7 @@ #endif GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -1050,7 +1050,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 6f diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds index fa2088b..04bc731 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds @@ -101,6 +101,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds index b10e0f9..8410bd7 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds @@ -62,6 +62,6 @@ SECTIONS *(.sbss*) *(.bss*) } - _end = .; + __bss_end__ = .; } ASSERT(__init_end <= 0xfff00ffc, "NAND bootstrap too big"); diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 506c7f2..efe34b7 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -125,6 +125,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } |