diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-19 01:48:14 +0000 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 20:24:07 +0200 | 
| commit | fa6c7413d1d5256516aad30b97eba3e4094c7ea3 (patch) | |
| tree | fade6f04d7e42bf31dc9ba4023c657b00c1c1feb /arch/arm/cpu/pxa/start.S | |
| parent | 91607ac17e534927f3086df6d663b02e900c596a (diff) | |
| download | olio-uboot-2014.01-fa6c7413d1d5256516aad30b97eba3e4094c7ea3.tar.xz olio-uboot-2014.01-fa6c7413d1d5256516aad30b97eba3e4094c7ea3.zip | |
arm: do not compile relocate_code() for SPL builds
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu/pxa/start.S')
| -rw-r--r-- | arch/arm/cpu/pxa/start.S | 8 | 
1 files changed, 2 insertions, 6 deletions
| diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index ada91a66c..595778a7b 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -118,10 +118,6 @@ _TEXT_BASE:  _bss_start_ofs:  	.word __bss_start - _start -.globl _image_copy_end_ofs -_image_copy_end_ofs: -	.word __image_copy_end - _start -  .globl _bss_end_ofs  _bss_end_ofs:  	.word __bss_end - _start @@ -201,7 +197,6 @@ copy_loop:  	cmp	r0, r2			/* until source end address [r2]    */  	blo	copy_loop -#ifndef CONFIG_SPL_BUILD  	/*  	 * fix .rel.dyn relocations  	 */ @@ -239,12 +234,13 @@ fixnext:  	add	r2, r2, #8		/* each rel.dyn entry is 8 bytes */  	cmp	r2, r3  	blo	fixloop -#endif  relocate_done:  	bx	lr +_image_copy_end_ofs: +	.word __image_copy_end - _start  _rel_dyn_start_ofs:  	.word __rel_dyn_start - _start  _rel_dyn_end_ofs: |