diff options
author | Wolfgang Denk <wd@denx.de> | 2011-03-27 19:20:29 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-03-27 19:20:29 (GMT) |
commit | c04bf5e9a45d7335681352faa125193258f8e976 (patch) | |
tree | ab512a5a8356b6f492100925acb63638a7c10ce9 /arch/powerpc/cpu/mpc83xx/start.S | |
parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
download | u-boot-fsl-qoriq-c04bf5e9a45d7335681352faa125193258f8e976.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/start.S')
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 460ac9a..7e60315 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -72,7 +72,7 @@ START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(__bss_start) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) #ifndef CONFIG_NAND_SPL GOT_ENTRY(_FIXUP_TABLE_) @@ -977,7 +977,7 @@ clear_bss: */ lwz r4,GOT(environment) #else - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) #endif cmplw 0, r3, r4 |