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
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 @@
{
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 @@
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 @@
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