CVS: blob/src/blob memsetup-sa1110.S,1.9,1.10

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv2855/src/blob

Modified Files:
	memsetup-sa1110.S 
Log Message:
Changed the SA-1110 memory setup routines so that stuff related to external
memory and memory in banks 2/3 is optional. Simply defining values such as
MDCAS21_VALUE to junk doesn't work.


Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1110.S,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- memsetup-sa1110.S	15 Jan 2002 01:45:01 -0000	1.9
+++ memsetup-sa1110.S	8 Feb 2002 10:19:56 -0000	1.10
@@ -58,18 +58,50 @@
 	.long	MDCAS00_VALUE		/* 0x04 MDCAS00 */
 	.long	MDCAS01_VALUE		/* 0x08 MDCAS01 */
 	.long	MDCAS02_VALUE		/* 0x0c MDCAS02 */
-	.long	MSC0_VALUE		/* 0x10 MSC0 */
-	.long	MSC1_VALUE		/* 0x14 MSC1 */
-	.long	MECR_VALUE		/* 0x18 MECR */
+	.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
+
 #ifdef MDRFER_DONT_BELIEVE_IN_MAGIC
 	.long	MDREFR_VALUE
 #else
-	.long	0xdeadbeef		/* 0x1C MDREFR */
-#endif		
+	.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 */
-	.long	MSC2_VALUE		/* 0x2C MSC2 */
+#else
+	.long	0x00000000
+#endif
+
+#ifdef MSC2_VALUE
+	.long	MSC2_VALUE			/* 0x2C MSC2 */
+#else
+	.long	0x00000000
+#endif
+
 	.long	SMCNFG_VALUE		/* 0x30 SMCNFG */
 
 .globl memsetup
@@ -92,14 +124,20 @@
 	ldr	r2, [r1, #MDCAS02 ]
 	str	r2, [r0, #MDCAS02 ]
 
+#ifdef MDCAS20_VALUE
 	ldr	r2, [r1, #MDCAS20 ]
 	str	r2, [r0, #MDCAS20 ]
+#endif
 
+#ifdef MDCAS21_VALUE
 	ldr	r2, [r1, #MDCAS21 ]
 	str	r2, [r0, #MDCAS21 ]
+#endif
 
+#ifdef MDCAS22_VALUE
 	ldr	r2, [r1, #MDCAS22 ]
 	str	r2, [r0, #MDCAS22 ]
+#endif
 
 #ifdef MDREFR_DONT_BELIEVE_IN_MAGIC
 	ldr	r2, [r1, #MDREFR ]
@@ -165,16 +203,23 @@
 	ldr	r2, [r1, #MCS0 ]
 	str	r2, [r0, #MCS0 ]
 
+#ifdef MSC1_VALUE
 	ldr	r2, [r1, #MCS1 ]
 	str	r2, [r0, #MCS1 ]
+#endif
 
+#ifdef MSC2_VALUE
 	ldr	r2, [r1, #MCS2 ]
 	str	r2, [r0, #MCS2 ]
+#endif
 
 	ldr	r2, [r1, #SMCNFG ]
 	str	r2, [r0, #SMCNFG ]
 
+#ifdef MECR_VALUE
 	ldr	r2, [r1, #MECR ]
 	str	r2, [r0, #MECR ]
-	
+#endif
+
 	mov	pc, r5
+