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/mpc8220/start.S | |
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/mpc8220/start.S')
-rw-r--r-- | arch/powerpc/cpu/mpc8220/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index ca42678..300b35c 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -69,7 +69,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -654,7 +654,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 |