dslinux/linux-2.6.x/arch/arm/mach-nds head.S

[amadeus]

Update of /cvsroot/dslinux/dslinux/linux-2.6.x/arch/arm/mach-nds
In directory antilope:/tmp/cvs-serv32311/linux-2.6.x/arch/arm/mach-nds

Modified Files:
	head.S 
Log Message:
Enable GBA RAM _before_ data cache

Index: head.S
===================================================================
RCS file: /cvsroot/dslinux/dslinux/linux-2.6.x/arch/arm/mach-nds/head.S,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- head.S	3 Sep 2006 20:21:36 -0000	1.21
+++ head.S	10 Sep 2006 19:13:07 -0000	1.22
@@ -199,6 +199,23 @@
 	mcr	p15, 0, r0, c9, c1
 
 	@-------------------------------------------------------------------------
+	@ Enable RAM on RAM-based cards.
+	@ This should be done with data cache disabled for GBA ROM space.
+	@ This has to happen early, because the kernel tries to
+        @ use this RAM.
+	@-------------------------------------------------------------------------
+#ifdef CONFIG_NDS_ROM8BIT
+#if defined(CONFIG_MMC_SCSD) || defined(CONFIG_IDE_NDS_SUPERCARD)
+	sc_set_ram	@ swith to RAM mode, restore @SC_LOCK from R2
+#endif
+#if defined(CONFIG_MMC_M3SD) || defined(CONFIG_IDE_NDS_M3)
+	m3_set_ram	@ switch to RAM mode
+#endif
+	@ more activation for other cards here
+
+#endif
+
+	@-------------------------------------------------------------------------
 	@ Setup memory regions
 	@-------------------------------------------------------------------------
 
@@ -346,9 +363,6 @@
 	strcc	r4, [r5],#4
 	bcc	1b
 
-	/* Enable RAM on RAM-based cards */
-	bl	unlock_ram
-
 	/*  Pretend we know what our processor code is (for arm_id)   */
 
 	ldr	r2, =0x41009460
@@ -359,21 +373,6 @@
 	mov fp, #0
 	b	start_kernel
 
-	/* Enable RAM on RAM-based cards.
-	 * This has to happen early, because the kernel tries to
-         * use this RAM. */
-unlock_ram:
-#ifdef CONFIG_NDS_ROM8BIT
-#if defined(CONFIG_MMC_SCSD) || defined(CONFIG_IDE_NDS_SUPERCARD)
-	sc_set_ram	@ swith to RAM mode, restore @SC_LOCK from R2
-#endif
-#ifdef CONFIG_MMC_M3SD
-	m3_set_rw
-#endif
-	@ more activation for other cards here
-#endif
-	mov	pc, lr	
-
 
 	.type	__LC0_init_data, %object
 __LC0_init_data: