leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ARM Integrator boards:

Browse Source 
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
This commit is contained in:
Wolfgang Denk
2005-10-04 23:10:28 +02:00
parent 1820d4c73b
commit 9b880bd4d8
19 changed files with 223 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
board/integratorap/integratorap.c
View File

@@ -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
*/

6
board/integratorap/platform.S
View File

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

7
board/integratorcp/platform.S
View File

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