summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJens Scharsig <js_at_ng@scharsoft.de>2010-12-18 02:30:04 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-05-18 07:56:52 +0200
commitce26582606adda28b3cd1a5d7646bbaa3a300937 (patch)
tree9c2fba6b71f97e3eab6ca3a064779c2e7f559250 /arch/arm
parentcfff263f41e32c7ba2ee9162a8cc6423eb5a8390 (diff)
downloadu-boot-imx-ce26582606adda28b3cd1a5d7646bbaa3a300937.zip
u-boot-imx-ce26582606adda28b3cd1a5d7646bbaa3a300937.tar.gz
u-boot-imx-ce26582606adda28b3cd1a5d7646bbaa3a300937.tar.bz2
at91rm9200: fix lowlevel_init() SMRDATA size
* use start/end label for initialization tables instead of fix values Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/arm920t/at91/lowlevel_init.S8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
index eaea9d2..8b58ba9 100644
--- a/arch/arm/cpu/arm920t/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
@@ -65,7 +65,8 @@ LoopOsc:
ldr r0, =SMRDATA
ldr r1, _MTEXT_BASE
sub r0, r0, r1
- add r2, r0, #80
+ ldr r2, =SMRDATAE
+ sub r2, r2, r1
pllloop:
/* the address */
ldr r1, [r0], #4
@@ -83,7 +84,8 @@ lock:
ldr r0, =SMRDATA1
ldr r1, _MTEXT_BASE
sub r0, r0, r1
- add r2, r0, #176
+ ldr r2, =SMRDATA1E
+ sub r2, r2, r1
sdinit:
/* the address */
ldr r1, [r0], #4
@@ -114,6 +116,7 @@ SMRDATA:
.word CONFIG_SYS_PLLBR_VAL
.word AT91_ASM_PMC_MCKR
.word CONFIG_SYS_MCKR_VAL
+SMRDATAE:
/* here there's a delay */
SMRDATA1:
.word AT91_ASM_PIOC_ASR
@@ -160,5 +163,6 @@ SMRDATA1:
.word CONFIG_SYS_SDRC_MR_VAL3
.word CONFIG_SYS_SDRAM
.word CONFIG_SYS_SDRAM_VAL
+SMRDATA1E:
/* SMRDATA1 is 176 bytes long */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */