summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorsascha <sascha@nomad.localdomain>2007-10-16 14:46:53 +0200
committersascha <sascha@nomad.localdomain>2007-10-16 14:46:53 +0200
commit520e857b20f5d24b5e0f3f0e7f982f8faaa10f83 (patch)
tree0b695154596c29daf6467719a1543a3dbd2b09eb /arch/arm
parentd46cc46f98b284608b410ca845224f4467e2bf76 (diff)
downloadbarebox-520e857b20f5d24b5e0f3f0e7f982f8faaa10f83.tar.gz
barebox-520e857b20f5d24b5e0f3f0e7f982f8faaa10f83.tar.xz
no need to have CONFIG_SKIP_RELOCATE_UBOOT
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/start-arm920t.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/start-arm920t.S b/arch/arm/cpu/start-arm920t.S
index 8935f9ede2..6c3989f9ae 100644
--- a/arch/arm/cpu/start-arm920t.S
+++ b/arch/arm/cpu/start-arm920t.S
@@ -150,7 +150,6 @@ reset:
bl board_init_lowlevel
#endif
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
@@ -167,7 +166,6 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
-#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup: