summaryrefslogtreecommitdiff
path: root/board/integratorcp/platform.S
diff options
context:
space:
mode:
Diffstat (limited to 'board/integratorcp/platform.S')
-rw-r--r--board/integratorcp/platform.S7
1 files changed, 4 insertions, 3 deletions
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