From fe7eb5d88bd593a35a13a0a84997ab6c41397bac Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sun, 25 Sep 2005 02:00:47 +0200 Subject: Cleanup --- board/integratorcp/platform.S | 83 +++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 42 deletions(-) (limited to 'board/integratorcp/platform.S') diff --git a/board/integratorcp/platform.S b/board/integratorcp/platform.S index 73d6922dd4..9bda771b8c 100644 --- a/board/integratorcp/platform.S +++ b/board/integratorcp/platform.S @@ -14,7 +14,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -52,8 +52,8 @@ platformsetup: #ifdef CONFIG_CM_INIT /* CM has an initialization register * - bits in it are wired into test-chip pins to force - * reset defaults - * - may need to change its contents for U-Boot + * reset defaults + * - may need to change its contents for U-Boot */ /* set the desired CM specific value */ @@ -65,39 +65,39 @@ platformsetup: #if !defined (CONFIG_CM920T) && !defined (CONFIG_CM920T_ETM) && \ !defined (CONFIG_CM940T) - -#ifdef CONFIG_CM_MULTIPLE_SSRAM - /* set simple mapping */ + +#ifdef CONFIG_CM_MULTIPLE_SSRAM + /* set simple mapping */ and r2,r2,#CMMASK_MAP_SIMPLE #endif /* #ifdef CONFIG_CM_MULTIPLE_SSRAM */ -#ifdef CONFIG_CM_TCRAM - /* disable TCRAM */ +#ifdef CONFIG_CM_TCRAM + /* disable TCRAM */ and r2,r2,#CMMASK_TCRAM_DISABLE -#endif /* #ifdef CONFIG_CM_TCRAM */ +#endif /* #ifdef CONFIG_CM_TCRAM */ #if defined (CONFIG_CM926EJ_S) || defined (CONFIG_CM1026EJ_S) || \ defined (CONFIG_CM1136JF_S) and r2,r2,#CMMASK_LE - + #endif /* cpu with little endian initialization */ orr r2,r2,#CMMASK_CMxx6_COMMON #endif /* CMxx6 code */ - + #endif /* ARM102xxE value */ - - /* read CM_INIT */ + + /* read CM_INIT */ mov r0, #CM_BASE ldr r1, [r0, #OS_INIT] /* check against desired bit setting */ and r3,r1,r2 cmp r3,r2 beq init_reg_OK - - /* lock for change */ + + /* lock for change */ mov r3, #CMVAL_LOCK and r3,r3,#CMMASK_LOCK str r3, [r0, #OS_LOCK] @@ -112,39 +112,39 @@ platformsetup: b reset_cpu init_reg_OK: - -#endif /* CONFIG_CM_INIT */ + +#endif /* CONFIG_CM_INIT */ mov pc, lr -#ifdef CONFIG_CM_SPD_DETECT +#ifdef CONFIG_CM_SPD_DETECT /* Fast memory is available for the DRAM data - * - ensure it has been transferred, then summarize the data + * - ensure it has been transferred, then summarize the data * into a CM register */ .globl dram_query dram_query: stmfd r13!,{r4-r6,lr} - /* set up SDRAM info */ + /* set up SDRAM info */ /* - based on example code from the CM User Guide */ mov r0, #CM_BASE - + readspdbit: - ldr r1, [r0, #OS_SDRAM] /* read the SDRAM register */ - and r1, r1, #0x20 /* mask SPD bit (5) */ - cmp r1, #0x20 /* test if set */ + ldr r1, [r0, #OS_SDRAM] /* read the SDRAM register */ + and r1, r1, #0x20 /* mask SPD bit (5) */ + cmp r1, #0x20 /* test if set */ bne readspdbit setupsdram: add r0, r0, #OS_SPD /* address the copy of the SDP data */ - ldrb r1, [r0, #3] /* number of row address lines */ + ldrb r1, [r0, #3] /* number of row address lines */ ldrb r2, [r0, #4] /* number of column address lines */ - ldrb r3, [r0, #5] /* number of banks */ - ldrb r4, [r0, #31] /* module bank density */ + ldrb r3, [r0, #5] /* number of banks */ + ldrb r4, [r0, #31] /* module bank density */ mul r5, r4, r3 /* size of SDRAM (MB divided by 4) */ - mov r5, r5, ASL#2 /* size in MB */ - mov r0, #CM_BASE /* reload for later code */ - cmp r5, #0x10 /* is it 16MB? */ + mov r5, r5, ASL#2 /* size in MB */ + mov r0, #CM_BASE /* reload for later code */ + cmp r5, #0x10 /* is it 16MB? */ bne not16 mov r6, #0x2 /* store size and CAS latency of 2 */ b writesize @@ -175,21 +175,21 @@ not128: writesize: mov r1, r1, ASL#8 /* row addr lines from SDRAM reg */ - orr r2, r1, r2, ASL#12 /* OR in column address lines */ - orr r3, r2, r3, ASL#16 /* OR in number of banks */ - orr r6, r6, r3 /* OR in size and CAS latency */ - str r6, [r0, #OS_SDRAM] /* store SDRAM parameters */ + orr r2, r1, r2, ASL#12 /* OR in column address lines */ + orr r3, r2, r3, ASL#16 /* OR in number of banks */ + orr r6, r6, r3 /* OR in size and CAS latency */ + str r6, [r0, #OS_SDRAM] /* store SDRAM parameters */ #endif /* #ifdef CONFIG_CM_SPD_DETECT */ ldmfd r13!,{r4-r6,pc} /* back to caller */ -#ifdef CONFIG_CM_REMAP - /* CM remap bit is operational +#ifdef CONFIG_CM_REMAP + /* CM remap bit is operational * - use it to map writeable memory at 0x00000000, in place of flash */ .globl cm_remap -cm_remap: +cm_remap: stmfd r13!,{r4-r10,lr} mov r0, #CM_BASE @@ -198,9 +198,9 @@ cm_remap: str r1, [r0, #OS_CTRL] /* Now 0x00000000 is writeable, replace the vectors */ - ldr r0, =_start /* r0 <- start of vectors */ - ldr r2, =_armboot_start /* r2 <- past vectors */ - sub r1,r1,r1 /* destination 0x00000000 */ + ldr r0, =_start /* r0 <- start of vectors */ + ldr r2, =_armboot_start /* r2 <- past vectors */ + sub r1,r1,r1 /* destination 0x00000000 */ copy_vec: ldmia r0!, {r3-r10} /* copy from source address [r0] */ @@ -208,7 +208,6 @@ copy_vec: cmp r0, r2 /* until source end address [r2] */ ble copy_vec - ldmfd r13!,{r4-r10,pc} /* back to caller */ + ldmfd r13!,{r4-r10,pc} /* back to caller */ #endif /* #ifdef CONFIG_CM_REMAP */ - -- cgit v1.2.1