[Linux-mips-commits]CVS: linux/arch/mips64 Makefile,1.4,1.5 defconfig,1.9,1.10

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv8516

Modified Files:
	Makefile defconfig 
Log Message:
Various mips 64 updates.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	2001/09/16 03:28:13	1.4
+++ Makefile	2001/11/20 18:04:22	1.5
@@ -20,9 +20,7 @@
 endif
 
 ifdef CONFIG_CROSSCOMPILE
-  ifndef CROSS_COMPILE
-    CROSS_COMPILE  = $(tool-prefix)
-  endif
+CROSS_COMPILE  = $(tool-prefix)
 endif
 
 #
@@ -64,6 +62,12 @@
 endif
 ifdef CONFIG_CPU_R10000
 CFLAGS		:= $(CFLAGS) -mcpu=r8000 -mips4
+endif
+ifdef CONFIG_CPU_SB1
+GCCFLAGS	+= -mcpu=sb1 -mips2 -Wa,--trap
+ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
+MODFLAGS	+= -msb1-pass1-workarounds
+endif
 endif
 
 ifdef CONFIG_MIPS_FPU_EMULATOR

Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- defconfig	2001/11/06 20:23:54	1.9
+++ defconfig	2001/11/20 18:04:22	1.10
@@ -10,9 +10,8 @@
 #
 # Machine selection
 #
-# CONFIG_SGI_IP22 is not set
 CONFIG_SGI_IP27=y
-# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SGI_SN0_N_MODE is not set
 CONFIG_DISCONTIGMEM=y
 CONFIG_NUMA=y
@@ -43,6 +42,7 @@
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R8000 is not set
 CONFIG_CPU_R10000=y
+# CONFIG_CPU_SB1 is not set
 
 #
 # General setup