[Gc-linux-cvs] linux/arch/powerpc/kernel head_32.S,1.1,1.2

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28622/arch/powerpc/kernel

Modified Files:
	head_32.S 
Log Message:
Added USB Gecko based udbg console, suitable for early debug too.


Index: head_32.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- head_32.S	4 Mar 2008 06:20:55 -0000	1.1
+++ head_32.S	26 Mar 2008 19:39:41 -0000	1.2
@@ -152,13 +152,8 @@
 #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
 	bl	setup_cpm_bat
 #endif
-#ifdef CONFIG_GAMECUBE
-	/* setup a block address translation register for early i/o */
-	bl	setup_gcn_bat
-	/* flush cache before relocation, first 24MB */
-	li	r3,0
-	lis	r4,0x0180
-	bl	flush_dcache_range
+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+	bl	setup_usbgecko_bat
 #endif
 
 /*
@@ -1269,19 +1264,19 @@
 	blr
 #endif
 
-#ifdef CONFIG_GAMECUBE
-setup_gcn_bat:
+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+setup_usbgecko_bat:
 	/* prepare a BAT for early io */
 	lis	r8, 0x0c00	/* DBAT3 for IO mem */
 	ori	r8, r8, 0x002a	/* uncached, guarded ,rw */
 	lis	r11, 0xcc00	/* DBAT3 for IO mem */
 	ori	r11, r11, 0x3	/* 128K */
-#ifdef CONFIG_GAMECUBE_WII
+#ifdef CONFIG_WII
 	oris	r8, r8, 0x0100
 	oris	r11, r11, 0x0100
 #endif
-	mtspr	SPRN_DBAT3L, r8
-	mtspr	SPRN_DBAT3U, r11
+	mtspr	SPRN_DBAT1L, r8
+	mtspr	SPRN_DBAT1U, r11
 	sync
 	isync
 	blr