Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv26574
Modified Files:
memsetup-sa1110.S
Log Message:
backout changes so we can still compile
Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1110.S,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- memsetup-sa1110.S 8 Feb 2002 14:21:50 -0000 1.11
+++ memsetup-sa1110.S 12 Feb 2002 00:03:50 -0000 1.12
@@ -58,18 +58,18 @@
.long MDCAS00_VALUE /* 0x04 MDCAS00 */
.long MDCAS01_VALUE /* 0x08 MDCAS01 */
.long MDCAS02_VALUE /* 0x0c MDCAS02 */
- .long MSC0_VALUE /* 0x10 MSC0 */
- .long 0 /* 0x14 MSC1 */
- .long 0 /* 0x18 MECR */
+ .long MSC0_VALUE /* 0x10 MSC0 */
+ .long MSC1_VALUE /* 0x14 MSC1 */
+ .long MECR_VALUE /* 0x18 MECR */
#ifdef MDRFER_DONT_BELIEVE_IN_MAGIC
.long MDREFR_VALUE
#else
- .long 0xdeadbeef /* 0x1C MDREFR */
-#endif
- .long 0 /* 0x20 MDCAS20 */
- .long 0 /* 0x24 MDCAS21 */
- .long 0 /* 0x28 MDCAS22 */
- .long 0 /* 0x2C MSC2 */
+ .long 0xdeadbeef /* 0x1C MDREFR */
+#endif
+ .long MDCAS20_VALUE /* 0x20 MDCAS20 */
+ .long MDCAS21_VALUE /* 0x24 MDCAS21 */
+ .long MDCAS22_VALUE /* 0x28 MDCAS22 */
+ .long MSC2_VALUE /* 0x2C MSC2 */
.long SMCNFG_VALUE /* 0x30 SMCNFG */
.globl memsetup
@@ -92,20 +92,14 @@
ldr r2, [r1, #MDCAS02 ]
str r2, [r0, #MDCAS02 ]
-#ifdef MDCAS20_VALUE
- mov r2, #MDCAS20_VALUE
+ ldr r2, [r1, #MDCAS20 ]
str r2, [r0, #MDCAS20 ]
-#endif
-#ifdef MDCAS21_VALUE
- mov r2, #MDCAS21_VALUE
+ ldr r2, [r1, #MDCAS21 ]
str r2, [r0, #MDCAS21 ]
-#endif
-#ifdef MDCAS22_VALUE
- mov r2, #MDCAS22_VALUE
+ ldr r2, [r1, #MDCAS22 ]
str r2, [r0, #MDCAS22 ]
-#endif
#ifdef MDREFR_DONT_BELIEVE_IN_MAGIC
ldr r2, [r1, #MDREFR ]
@@ -171,23 +165,16 @@
ldr r2, [r1, #MCS0 ]
str r2, [r0, #MCS0 ]
-#ifdef MSC1_VALUE
- mov r2, #MSC1_VALUE
+ ldr r2, [r1, #MCS1 ]
str r2, [r0, #MCS1 ]
-#endif
-#ifdef MSC2_VALUE
- mov r2, #MSC2_VALUE
+ ldr r2, [r1, #MCS2 ]
str r2, [r0, #MCS2 ]
-#endif
ldr r2, [r1, #SMCNFG ]
str r2, [r0, #SMCNFG ]
-#ifdef MECR_VALUE
- mov r2, #MECR_VALUE
+ ldr r2, [r1, #MECR ]
str r2, [r0, #MECR ]
-#endif
-
+
mov pc, r5
-
|
