Message ID | 4CFA1DB1.3010100@scharsoft.de |
---|---|
State | Rejected |
Delegated to: | Reinhard Meyer |
Headers | show |
Dear Jens Scharsig, Am 04.12.2010 um 11:53 schrieb Jens Scharsig: [snip] > So we should resolve this in a future-proof way (see below) > > arch/arm/cpu/arm920t/at91/lowlevel_init.S | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S > index eaea9d2..1143c7e 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 > + add r2, r2, r1 Your approach seems better, therefore Acked-by: Andreas Bießmann <andreas.devel@googlemail.com> regards Andreas Bießmann
Dear Jens Scharsig, Am 04.12.2010 um 11:53 schrieb Jens Scharsig: > diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S > index eaea9d2..1143c7e 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 > + add r2, r2, r1 > pllloop: > /* the address */ > ldr r1, [r0], #4 > @@ -82,8 +83,8 @@ lock: > bhi lock > ldr r0, =SMRDATA1 > ldr r1, _MTEXT_BASE > - sub r0, r0, r1 > - add r2, r0, #176 > + ldr r2, =SMRDATA1E > + add r2, r2, r1 OUCH, one line to much deleted ... regards Andreas Bießmann
diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S index eaea9d2..1143c7e 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 + add r2, r2, r1 pllloop: /* the address */ ldr r1, [r0], #4 @@ -82,8 +83,8 @@ lock: bhi lock ldr r0, =SMRDATA1 ldr r1, _MTEXT_BASE - sub r0, r0, r1 - add r2, r0, #176 + ldr r2, =SMRDATA1E + add r2, r2, r1 sdinit: /* the address */ ldr r1, [r0], #4 @@ -114,6 +115,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 +162,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 */