diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 | 
| commit | cd77dd109c4a439519a78c32eddc42bdebc7a61f (patch) | |
| tree | c5534647cb1786044ef0f7e4ad4067725eddf11d /cpu/mpc8xx/start.S | |
| parent | 95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff) | |
| parent | afc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff) | |
| download | olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.xz olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip | |
Merge branch 'reloc'
Diffstat (limited to 'cpu/mpc8xx/start.S')
| -rw-r--r-- | cpu/mpc8xx/start.S | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S index 8864c37cf..e84326ebd 100644 --- a/cpu/mpc8xx/start.S +++ b/cpu/mpc8xx/start.S @@ -589,15 +589,17 @@ in_ram:  	sub	r11,r3,r11  	addi	r3,r3,-4  1:	lwzu	r0,4(r3) +	cmpwi	r0,0 +	beq-	2f  	add	r0,r0,r11  	stw	r0,0(r3) -	bdnz	1b +2:	bdnz	1b  	/*  	 * Now adjust the fixups and the pointers to the fixups  	 * in case we need to move ourselves again.  	 */ -2:	li	r0,__fixup_entries@sectoff@l +	li	r0,__fixup_entries@sectoff@l  	lwz	r3,GOT(_FIXUP_TABLE_)  	cmpwi	r0,0  	mtctr	r0 |