Update of /cvsroot/gc-linux/linux/arch/ppc/boot/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24035/arch/ppc/boot/common
Modified Files:
util.S
Log Message:
Merged 2.6.5
Index: util.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/common/util.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- util.S 23 Jan 2004 03:26:19 -0000 1.1.1.1
+++ util.S 24 Apr 2004 18:31:43 -0000 1.2
@@ -14,7 +14,7 @@
* tr...@mv...
* Derived from arch/ppc/boot/prep/head.S (Cort Dougan, many others).
*
- * 2001-2003 (c) MontaVista, Software, Inc. This file is licensed under
+ * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
@@ -37,6 +37,13 @@
#ifndef CONFIG_GAMECUBE
li r8,MSR_IP|MSR_FP
mtmsr r8
+ isync
+
+ /* Test for a 601 */
+ mfpvr r10
+ srwi r10,r10,16
+ cmpi 0,r10,1 /* 601 ? */
+ beq .clearbats_601
#endif
#ifdef CONFIG_GAMECUBE
@@ -81,6 +88,7 @@
mtspr DBAT2L,r8
mtspr DBAT3U,r8
mtspr DBAT3L,r8
+.clearbats_601:
mtspr IBAT0U,r8
mtspr IBAT0L,r8
mtspr IBAT1U,r8
@@ -113,13 +121,12 @@
addi r8,r8,0x111 /* increment VSID */
addis r10,r10,0x1000 /* address of next segment */
bdnz 3b
-
#ifdef CONFIG_GAMECUBE
mflr r8
clrlwi r8, r8, 3
mtlr r8
- blr
#endif
+ blr
.globl disable_6xx_l1cache
disable_6xx_l1cache:
|
