[Gc-linux-cvs] linux/arch/ppc/boot/simple head.S,1.4,1.5

[<he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11649

Modified Files:
	head.S 
Log Message:
Simplified (grouped) the patch a little bit.


Index: head.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/head.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- head.S	15 Aug 2004 22:33:03 -0000	1.4
+++ head.S	11 Oct 2004 22:04:28 -0000	1.5
@@ -69,14 +69,6 @@
 
 	/* The following functions we call must not modify r3 or r4.....
 	*/
-#ifdef CONFIG_GAMECUBE_CONSOLE
-	/* setup the framebuffer for the debug console */
-	lis	r8, 0xcc00
-	lis	r5, 0x00c0
-	stw	r5, 0x201c(r8)
-	addi	r5, r5, 1280
-	stw	r5, 0x2024(r8)
-#endif
 #ifdef CONFIG_6xx
 	/* On PReP we must look at the OpenFirmware pointer and sanity
 	 * test it.  On other platforms, we disable the MMU right now
@@ -108,11 +100,25 @@
 #else
 	bl	disable_6xx_mmu
 #endif
-#ifndef CONFIG_GAMECUBE
+
+#ifdef CONFIG_GAMECUBE
+	/* convert our starting address to physical layout format */
+	clrlwi r3, r3, 3
+#else
 	bl	disable_6xx_l1cache
 
 	CLEAR_CACHES
-#endif
+#endif /* CONFIG_GAMECUBE */
+
+#ifdef CONFIG_GAMECUBE_CONSOLE
+	/* setup the framebuffer address for the early debug console */
+	lis	r8, 0xcc00
+	lis	r5, 0x00c0
+	stw	r5, 0x201c(r8)
+	addi	r5, r5, 1280
+	stw	r5, 0x2024(r8)
+#endif /* CONFIG_GAMECUBE_CONSOLE */
+
 #endif
 
 #ifdef CONFIG_8xx
@@ -152,9 +158,6 @@
 
 	/* Get the load address.
 	*/
-#ifdef CONFIG_GAMECUBE
-	clrlwi r3, r3, 3
-#endif
-	subi    r3, r3, 4	/* Get the actual IP, not NIP */
+	subi	r3, r3, 4	/* Get the actual IP, not NIP */
 	b	relocate