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

[u-boot] / board / mpl / vcma9 / lowlevel_init.S

diff --git a/board/mpl/vcma9/lowlevel_init.S b/board/mpl/vcma9/lowlevel_init.S
index b889cf94af6122bb3d0f7aa714619348dff66876..c0d6cc8923d8a7ed97f95b6ebb95622e2b3d4ad6 100644 (file)
--- a/board/mpl/vcma9/lowlevel_init.S
+++ b/board/mpl/vcma9/lowlevel_init.S
@@ -13,8 +13,6 @@
 
 
 #include <config.h>
-#include <version.h>
-
 
 /* register definitions */
 
@@ -197,13 +195,10 @@
 #define REFCNT_266             0
 /**************************************/
 
-_TEXT_BASE:
-       .word   CONFIG_SYS_TEXT_BASE
-
 .globl lowlevel_init
 lowlevel_init:
        /* use r0 to relocate DATA read/write to flash rather than memory ! */
-       ldr     r0, _TEXT_BASE
+       ldr     r0, =CONFIG_SYS_TEXT_BASE
        ldr     r13, =BWSCON
 
        /* enable minimal access to PLD */
@@ -232,7 +227,7 @@ lowlevel_init:
        bne     0b
 
        /* PLD access is now possible */
-       /* r3 = SDRAMDATA
+       /* r3 = SDRAMDATA */
        /* r13 = pointer to MEM controller regs */
        ldr     r1, =PLD_BASE
        mov     r4, #SDRAMENTRY_SIZE