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/arm946es | |
| parent | 91607ac17e534927f3086df6d663b02e900c596a (diff) | |
| download | u-boot-imx-fa6c7413d1d5256516aad30b97eba3e4094c7ea3.zip u-boot-imx-fa6c7413d1d5256516aad30b97eba3e4094c7ea3.tar.gz u-boot-imx-fa6c7413d1d5256516aad30b97eba3e4094c7ea3.tar.bz2 | |
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/arm946es')
| -rw-r--r-- | arch/arm/cpu/arm946es/start.S | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 9c2b70d..2fc730c 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -105,10 +105,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 @@ -159,6 +155,7 @@ reset: /*------------------------------------------------------------------------------*/ +#ifndef CONFIG_SPL_BUILD /* * void relocate_code(addr_moni) * @@ -181,7 +178,6 @@ copy_loop: cmp r0, r2 /* until source end address [r2] */ blo copy_loop -#ifndef CONFIG_SPL_BUILD /* * fix .rel.dyn relocations */ @@ -219,12 +215,13 @@ fixnext: add r2, r2, #8 /* each rel.dyn entry is 8 bytes */ cmp r2, r3 blo fixloop -#endif relocate_done: mov pc, lr +_image_copy_end_ofs: + .word __image_copy_end - _start _rel_dyn_start_ofs: .word __rel_dyn_start - _start _rel_dyn_end_ofs: @@ -232,6 +229,8 @@ _rel_dyn_end_ofs: _dynsym_start_ofs: .word __dynsym_start - _start +#endif + .globl c_runtime_cpu_setup c_runtime_cpu_setup: |