diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-04 21:10:28 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-04 21:10:28 (GMT) |
| commit | 9b880bd4d86dc568221107516e6d4728c5f93a4e (patch) | |
| tree | f802140e9fde0fff54cf0eb246fd35c931fc0b0f /board | |
| parent | 1820d4c73b78ebe5d08921b0b6249c6f72e45215 (diff) | |
| download | u-boot-9b880bd4d86dc568221107516e6d4728c5f93a4e.tar.xz | |
Update ARM Integrator boards:
Correct addessing errors in platform files.
Split off common core module data from Integrator header files to
include/armcoremodule.h.
Patch by Peter Pearse, 04 Oct 2005
Diffstat (limited to 'board')
| -rw-r--r-- | board/integratorap/integratorap.c | 5 | ||||
| -rw-r--r-- | board/integratorap/platform.S | 6 | ||||
| -rw-r--r-- | board/integratorcp/platform.S | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index d4f61d6..4baf39a 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -649,3 +649,8 @@ ulong get_tbclk (void) { return CFG_HZ_CLOCK/div_clock; } + +/* The Integrator/AP timer1 is clocked at 24MHz + * can be divided by 16 or 256 + * and is a 16-bit counter + */ diff --git a/board/integratorap/platform.S b/board/integratorap/platform.S index 2d9b436..b208adb 100644 --- a/board/integratorap/platform.S +++ b/board/integratorap/platform.S @@ -32,7 +32,7 @@ reset_cpu: mov r0, #CM_BASE ldr r1,[r0,#OS_CTRL] orr r1,r1,#CMMASK_RESET - str r1,[r0] + str r1,[r0,#OS_CTRL] reset_failed: b reset_failed @@ -98,8 +98,8 @@ platformsetup: beq init_reg_OK /* lock for change */ - mov r3, #CMVAL_LOCK - and r3,r3,#CMMASK_LOCK + mov r3, #CMVAL_LOCK1 + add r3,r3,#CMVAL_LOCK2 str r3, [r0, #OS_LOCK] /* set desired value */ orr r1,r1,r2 diff --git a/board/integratorcp/platform.S b/board/integratorcp/platform.S index 9bda771..612a2c4 100644 --- a/board/integratorcp/platform.S +++ b/board/integratorcp/platform.S @@ -32,7 +32,7 @@ reset_cpu: mov r0, #CM_BASE ldr r1,[r0,#OS_CTRL] orr r1,r1,#CMMASK_RESET - str r1,[r0] + str r1,[r0,#OS_CTRL] reset_failed: b reset_failed @@ -65,6 +65,7 @@ platformsetup: #if !defined (CONFIG_CM920T) && !defined (CONFIG_CM920T_ETM) && \ !defined (CONFIG_CM940T) + /* CMxx6 code */ #ifdef CONFIG_CM_MULTIPLE_SSRAM /* set simple mapping */ @@ -98,8 +99,8 @@ platformsetup: beq init_reg_OK /* lock for change */ - mov r3, #CMVAL_LOCK - and r3,r3,#CMMASK_LOCK + mov r3, #CMVAL_LOCK1 + and r3, r3, #CMVAL_LOCK2 str r3, [r0, #OS_LOCK] /* set desired value */ orr r1,r1,r2 |