Patch by Steven Scholz, 4 Apr 2005:

[u-boot] / cpu / ixp / start.S

diff --git a/cpu/ixp/start.S b/cpu/ixp/start.S
index 3b3c868fe096e8ca045dfe6abd464d49aa16c4fb..2726f659788d00f04437774d8be44267b2f4a375 100644 (file)
--- a/cpu/ixp/start.S
+++ b/cpu/ixp/start.S
@@ -261,6 +261,7 @@ reset:
        orr     r0,r0,#0x13
        msr     cpsr,r0
 
+#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 */
@@ -277,6 +278,7 @@ 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: