[Linux-mips-commits]CVS: linux/arch/mips64 config.in,1.4,1.5

[Paul M. <le...@us...>]

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

Modified Files:
	config.in 
Log Message:
Sync with OSS (except for sysmips, which is waiting to be tested first).



Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.in	2001/10/15 16:09:45	1.4
+++ config.in	2001/10/27 17:28:54	1.5
@@ -13,7 +13,8 @@
 comment 'Machine selection'
 choice 'Machine type'						\
 	"SGI-IP22,Indy/Indigo2 CONFIG_SGI_IP22			\
-	 SGI-IP27,Origin200/2000 CONFIG_SGI_IP27"  SGI-IP27,Origin200/2000
+	 SGI-IP27,Origin200/2000 CONFIG_SGI_IP27		\
+	 SGI-IP32,O2 CONFIG_SGI_IP32"  CONFIG_SGI_IP27
 
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    bool '  IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
@@ -61,6 +62,17 @@
    define_bool CONFIG_PCI y
    define_bool CONFIG_QL_ISP_A64 y
    define_int CONFIG_L1_CACHE_SHIFT 7
+fi
+
+if [ "$CONFIG_SGI_IP32" = "y" ]; then
+   define_bool CONFIG_BOOT_ELF32 y
+   define_bool CONFIG_ARC32 y
+   define_bool CONFIG_PC_KEYB y
+   define_bool CONFIG_PCI y
+   #define_bool CONFIG_BOARD_SCACHE y
+   define_bool CONFIG_MAPPED_PCI_IO y
+   define_bool CONFIG_ARC_MEMORY y
+   define_int CONFIG_L1_CACHE_SHIFT 5
 fi
 
 if [ "$CONFIG_ISA" != "y" ]; then