Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv19968/src/blob
Modified Files:
memsetup-sa1110.S
Log Message:
Cleaned up the #ifdef jungle caused by the optional memory configuration
settings (a bit at least. there is still some #ifdef's left in
memsetup-sa1110.S).
Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1110.S,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- memsetup-sa1110.S 8 Feb 2002 10:19:56 -0000 1.10
+++ memsetup-sa1110.S 8 Feb 2002 14:21:50 -0000 1.11
@@ -59,49 +59,17 @@
.long MDCAS01_VALUE /* 0x08 MDCAS01 */
.long MDCAS02_VALUE /* 0x0c MDCAS02 */
.long MSC0_VALUE /* 0x10 MSC0 */
-
-#ifdef MSC1_VALUE
- .long MSC1_VALUE /* 0x14 MSC1 */
-#else
- .long 0x00000000
-#endif
-
-#ifdef MECR_VALUE
- .long MECR_VALUE /* 0x18 MECR */
-#else
- .long 0x00000000
-#endif
-
+ .long 0 /* 0x14 MSC1 */
+ .long 0 /* 0x18 MECR */
#ifdef MDRFER_DONT_BELIEVE_IN_MAGIC
.long MDREFR_VALUE
#else
.long 0xdeadbeef /* 0x1C MDREFR */
#endif
-
-#ifdef MDCAS20_VALUE
- .long MDCAS20_VALUE /* 0x20 MDCAS20 */
-#else
- .long 0x00000000
-#endif
-
-#ifdef MDCAS21_VALUE
- .long MDCAS21_VALUE /* 0x24 MDCAS21 */
-#else
- .long 0x00000000
-#endif
-
-#ifdef MDCAS22_VALUE
- .long MDCAS22_VALUE /* 0x28 MDCAS22 */
-#else
- .long 0x00000000
-#endif
-
-#ifdef MSC2_VALUE
- .long MSC2_VALUE /* 0x2C MSC2 */
-#else
- .long 0x00000000
-#endif
-
+ .long 0 /* 0x20 MDCAS20 */
+ .long 0 /* 0x24 MDCAS21 */
+ .long 0 /* 0x28 MDCAS22 */
+ .long 0 /* 0x2C MSC2 */
.long SMCNFG_VALUE /* 0x30 SMCNFG */
.globl memsetup
@@ -125,17 +93,17 @@
str r2, [r0, #MDCAS02 ]
#ifdef MDCAS20_VALUE
- ldr r2, [r1, #MDCAS20 ]
+ mov r2, #MDCAS20_VALUE
str r2, [r0, #MDCAS20 ]
#endif
#ifdef MDCAS21_VALUE
- ldr r2, [r1, #MDCAS21 ]
+ mov r2, #MDCAS21_VALUE
str r2, [r0, #MDCAS21 ]
#endif
#ifdef MDCAS22_VALUE
- ldr r2, [r1, #MDCAS22 ]
+ mov r2, #MDCAS22_VALUE
str r2, [r0, #MDCAS22 ]
#endif
@@ -204,12 +172,12 @@
str r2, [r0, #MCS0 ]
#ifdef MSC1_VALUE
- ldr r2, [r1, #MCS1 ]
+ mov r2, #MSC1_VALUE
str r2, [r0, #MCS1 ]
#endif
#ifdef MSC2_VALUE
- ldr r2, [r1, #MCS2 ]
+ mov r2, #MSC2_VALUE
str r2, [r0, #MCS2 ]
#endif
@@ -217,7 +185,7 @@
str r2, [r0, #SMCNFG ]
#ifdef MECR_VALUE
- ldr r2, [r1, #MECR ]
+ mov r2, #MECR_VALUE
str r2, [r0, #MECR ]
#endif
|
