blob/src start.S,1.4,1.5 memsetup-sa1110.S,1.3,1.4

[Erik M. <er...@us...>]

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

Modified Files:
	start.S memsetup-sa1110.S 
Log Message:
- move led init before memory init
- cleanup sa1110 memory setup. creditlart is the same as assabet for the time
  being


Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start.S	2001/10/04 12:16:37	1.4
+++ start.S	2001/10/04 16:26:50	1.5
@@ -103,11 +103,11 @@
 	str	r1, [r0, #PPCR]
 
 
-	/* setup memory */
-	bl	memsetup
-
 	/* init LED */
 	bl	ledinit
+
+	/* setup memory */
+	bl	memsetup
 
 	
 	/* check if this is a wake-up from sleep */

Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/memsetup-sa1110.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memsetup-sa1110.S	2001/10/04 12:23:08	1.3
+++ memsetup-sa1110.S	2001/10/04 16:26:50	1.4
@@ -45,10 +45,9 @@
 
 .text
 MEM_REG_BASE:	.long	0xa0000000
-MEM_START:		.long	0xc0000000
+MEM_START:	.long	0xc0000000
 
-#ifdef ASSABET
-	.align 4
+#if (defined ASSABET) || (defined CLART)
 MEMORY_CONFIG:
 	.long	0x72547254		/* 0x0  MDCNFG */
 	.long	0xAAAAAA7F		/* 0x04 MDCAS00 */
@@ -63,11 +62,9 @@
 	.long	0xAAAAAAAA		/* 0x28 MDCAS22 */
 	.long	0x42196669		/* 0x2C MCS2 */
 	.long	0xafccafcc		/* 0x30 SMCNFG */
-MEMORY_CONFIG_END:
-	.long	0x0
+#endif
 
-#elif defined PT_SYSTEM3
-	.align 4
+#if defined PT_SYSTEM3
 MEMORY_CONFIG:
 	.long	0x72547254		/* 0x0  MDCNFG */
 	.long	0xAAAAAA7F		/* 0x04 MDCAS00 */
@@ -82,21 +79,16 @@
 	.long	0xAAAAAAAA		/* 0x28 MDCAS22 */
 	.long	0x00002249		/* 0x2C MCS2 */
 	.long	0xafccafcc		/* 0x30 SMCNFG */
-MEMORY_CONFIG_END:
-	.long	0x0
-#else
-#	error "add memory config for your board!"
 #endif
 
+
 .globl memsetup
 memsetup:
 	mov r5, lr
-	bl ledinit
-	bl led_on
 
 	/* Set up the SDRAM */
 	ldr	r0, MEM_REG_BASE
-	adr r1, MEMORY_CONFIG
+	adr	r1, MEMORY_CONFIG
 
 	ldr	r2, [r1, #MDCNFG ]
 	str	r2, [r0, #MDCNFG ]
@@ -119,25 +111,21 @@
 	ldr	r2, [r1, #MDCAS22 ]
 	str	r2, [r0, #MDCAS22 ]
 
-#if 1
 	/* clear K1DB2 K2DB2 */
 	ldr r2, [ r0, #MDREFR ]
-	bic r2, r2, #MDREFR_K1DB2
-	//bic r2, r2, #MDREFR_K2DB2
+	bic r2, r2, #(MDREFR_K1DB2 | MDREFR_K2DB2)
 	str r2, [ r0, #MDREFR ]
 
 	/* set TRASR and DRI, K1DB2 K2DB2 */
 	ldr r2, [ r0, #MDREFR ]
 	orr r2, r2, #MDREFR_TRASR(7)
 	orr r2, r2, #MDREFR_DRI(12)
-	orr r2, r2, #MDREFR_K1DB2
-	orr r2, r2, #MDREFR_K2DB2
+	orr r2, r2, #(MDREFR_K1DB2 | MDREFR_K2DB2)
 	str r2, [ r0, #MDREFR ]
 
 	/* set K1RUN K2RUN */
 	ldr r2, [ r0, #MDREFR ]
-	orr r2, r2, #MDREFR_K1RUN
-	orr r2, r2, #MDREFR_K2RUN
+	orr r2, r2, #(MDREFR_K1RUN | MDREFR_K2RUN)
 	str r2, [ r0, #MDREFR ]
 
 	/* clear SLFRSH */
@@ -149,14 +137,6 @@
 	ldr r2, [ r0, #MDREFR ]
 	orr r2, r2, #MDREFR_E1PIN
 	str r2, [ r0, #MDREFR ]
-#else
-	ldr r2, [ r1, #MDREFR ]
-	orr r2, r2, #MDREFR_K1DB2
-	orr r2, r2, #MDREFR_K2DB2
-	//orr r2, r2, #MDREFR_EAPD
-	//orr r2, r2, #MDREFR_KAPD
-	str r2, [ r0, #MDREFR ]
-#endif
 
 	/* Issue read requests to disabled bank to start refresh */
 	ldr	r1, =0xC0000000
@@ -169,19 +149,8 @@
 	
 	/* ENABLE SDRAM BANKS */
 	ldr	r2, [r0, #MDCNFG ]
-#if defined ASSABET
-	orr r2, r2, #0x00000001	/* BANK 0 */
-	// orr r2, r2, #0x00000002	/* BANK 1 */
-	// orr r2, r2, #0x00010000	/* BANK 2 */
-	// orr r2, r2, #0x00020000	/* BANK 3 */
-#elif defined PT_SYSTEM3
-	orr r2, r2, #0x00000001	/* BANK 0 */
-	// orr r2, r2, #0x00000002	/* BANK 1 */
-	orr r2, r2, #0x00010000	/* BANK 2 */
-	// orr r2, r2, #0x00020000	/* BANK 3 */
-#else
-#	error "Enable SDRAM Banks on your board!"
-#endif
+	orr	r2, r2, #0x00000003
+	orr	r2, r2, #0x00030000
 	str	r2, [r0, #MDCNFG]
 
 	/* OPTIONALLY enable Autopowerup/down */