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 dadaac72998b6473c688817b7c91c6a46c2f24d3..c0d6cc8923d8a7ed97f95b6ebb95622e2b3d4ad6 100644 (file)
--- a/board/mpl/vcma9/lowlevel_init.S
+++ b/board/mpl/vcma9/lowlevel_init.S
@@ -8,29 +8,11 @@
  * David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
  * (C) Copyright 2002, 2003, 2004, 2005
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
 #include <config.h>
-#include <version.h>
-
 
 /* register definitions */
 
@@ -213,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 */
@@ -248,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