diff options
Diffstat (limited to 'arch/arm/cpu/armv7/start.S')
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index b9eb0c9b5..bdf2fad38 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -275,8 +275,10 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */  jump_2_ram:  	ldr	r0, _board_init_r_ofs  	adr	r1, _start -	add	r0, r0, r1 -	add	lr, r0, r9 +	add	lr, r0, r1 +#ifndef CONFIG_SKIP_RELOCATE_UBOOT +	add	lr, lr, r9 +#endif  	/* setup parameters for board_init_r */  	mov	r0, r5		/* gd_t */  	mov	r1, r7		/* dest_addr */ |