CVS: blob/src/blob memsetup-sa1100.S,1.4,1.5

[Christopher H. <ch...@us...>]

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

Modified Files:
	memsetup-sa1100.S 
Log Message:
prefix register offsets with _ so as to not conflict with sa1100.h defines

Index: memsetup-sa1100.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1100.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- memsetup-sa1100.S	4 Apr 2002 09:07:58 -0000	1.4
+++ memsetup-sa1100.S	25 Jul 2002 17:25:59 -0000	1.5
@@ -44,11 +44,11 @@
 
 MEM_BASE:	.long	0xa0000000
 MEM_START:	.long	MEMORY_START
-#define	MDCNFG	0x0
-#define MDCAS0	0x04
-#define MDCAS1	0x08
-#define MDCAS2	0x0c
-#define MCS0	0x10
+#define	_MDCNFG	0x0
+#define _MDCAS0	0x04
+#define _MDCAS1	0x08
+#define _MDCAS2	0x0c
+#define _MCS0	0x10
 
 
 
@@ -107,25 +107,25 @@
 	ldr	r0, MEM_BASE
 	
 	ldr	r1, mcs0
-	str	r1, [r0, #MCS0]
+	str	r1, [r0, #_MCS0]
 	
 	/* Set up the DRAM */
 	
 	/* MDCAS0 */
 	ldr	r1, mdcas0
-	str	r1, [r0, #MDCAS0]
+	str	r1, [r0, #_MDCAS0]
 
 	/* MDCAS1 */
 	ldr	r1, mdcas1
-	str	r1, [r0, #MDCAS1]
+	str	r1, [r0, #_MDCAS1]
 
 	/* MDCAS2 */
 	ldr	r1, mdcas2
-	str	r1, [r0, #MDCAS2]
+	str	r1, [r0, #_MDCAS2]
 
 	/* MDCNFG */
 	ldr	r1, mdcnfg
-	str	r1, [r0, #MDCNFG]
+	str	r1, [r0, #_MDCNFG]
 
 	/* Issue read requests to disabled bank to start refresh */
 	/* this is required by the Micron memory on a TuxScreen */