summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/sa1100
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-28 20:52:49 +0200
committerWolfgang Denk <wd@denx.de>2010-10-29 21:40:08 +0200
commite03f31697478e9edd523f34b1ed54b6ff2cb7242 (patch)
tree34270cc09fbd38b4094aa67893b895b6567b65fa /arch/arm/cpu/sa1100
parenta9aa3926295df759306258e5e24cace414f53b67 (diff)
Drop support for CONFIG_SKIP_RELOCATE_UBOOT
For ARM systems, before ELF relocation was introduced, CONFIG_SKIP_RELOCATE_UBOOT coul be used to prevent *COPYING* the U-Boot image from whereever it was loaded to it's link address (CONFIG_SYS_TEXT_BASE). The name was badly chosen, as no relocation was performed at all, it was just a memcpy(). With ELF relocation, this does not work like that any more, and related boards need to be fixed anyway. So don't keep this relict any longer. Signed-off-by: Wolfgang Denk <wd@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/cpu/sa1100')
-rw-r--r--arch/arm/cpu/sa1100/start.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S
index ab6e2f21949..ace0c074df7 100644
--- a/arch/arm/cpu/sa1100/start.S
+++ b/arch/arm/cpu/sa1100/start.S
@@ -183,7 +183,6 @@ stack_setup:
cmp r0, r6
beq clear_bss
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
copy_loop:
ldmia r0!, {r9-r10} /* copy from source address [r0] */
stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -210,7 +209,6 @@ fixloop:
cmp r2, r3
blo fixloop
#endif
-#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
clear_bss:
#ifndef CONFIG_PRELOADER