projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
board
/
mpl
/
vcma9
/
lowlevel_init.S
diff --git
a/board/mpl/vcma9/lowlevel_init.S
b/board/mpl/vcma9/lowlevel_init.S
index
b889cf9
..
ee9b7a9
100644
(file)
--- a/
board/mpl/vcma9/lowlevel_init.S
+++ b/
board/mpl/vcma9/lowlevel_init.S
@@
-197,13
+197,10
@@
#define REFCNT_266 0
/**************************************/
#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 ! */
.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 */
ldr r13, =BWSCON
/* enable minimal access to PLD */
@@
-232,7
+229,7
@@
lowlevel_init:
bne 0b
/* PLD access is now possible */
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
/* r13 = pointer to MEM controller regs */
ldr r1, =PLD_BASE
mov r4, #SDRAMENTRY_SIZE