Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[karo-tx-uboot.git] / arch / blackfin / cpu / start.S

diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S
index c99cf49833511a0c2c08ec5b2c1a4b82493345a6..f31abfacf212ec5c542dc6420733bf6afdeb3ccc 100644 (file)
--- a/arch/blackfin/cpu/start.S
+++ b/arch/blackfin/cpu/start.S
@@ -190,19 +190,19 @@ ENTRY(_start)
        call _memcpy_ASM;
 #endif
 
+.Lnorelocate:
        /* Initialize BSS section ... we know that memset() does not
         * use the BSS, so it is safe to call here.  The bootrom LDR
         * takes care of clearing things for us.
         */
        serial_early_puts("Zero BSS");
-       r0.l = __bss_vma;
-       r0.h = __bss_vma;
+       r0.l = __bss_start;
+       r0.h = __bss_start;
        r1 = 0 (x);
        r2.l = __bss_len;
        r2.h = __bss_len;
        call _memset;
 
-.Lnorelocate:
 
        /* Setup the actual stack in external memory */
        sp.h = HI(CONFIG_STACKBASE);
@@ -251,3 +251,13 @@ LENTRY(_get_pc)
 #endif
        rts;
 ENDPROC(_get_pc)
+
+ENTRY(_relocate_code)
+       /* Fake relocate code. Setup the new stack only */
+       sp = r0;
+       fp = sp;
+       r0 = p3;
+       r1.h = 0x2000;
+       r1.l = 0x10;
+       jump.l _board_init_r
+ENDPROC(_relocate_code)