summaryrefslogtreecommitdiff
path: root/board/integratorcp
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-04 23:10:28 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-04 23:10:28 +0200
commit9b880bd4d86dc568221107516e6d4728c5f93a4e (patch)
treef802140e9fde0fff54cf0eb246fd35c931fc0b0f /board/integratorcp
parent1820d4c73b78ebe5d08921b0b6249c6f72e45215 (diff)
downloadu-boot-imx-9b880bd4d86dc568221107516e6d4728c5f93a4e.zip
u-boot-imx-9b880bd4d86dc568221107516e6d4728c5f93a4e.tar.gz
u-boot-imx-9b880bd4d86dc568221107516e6d4728c5f93a4e.tar.bz2
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/integratorcp')
-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