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

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

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

Modified Files:
	config.in 
Log Message:
IP22 uses a PC keyboard.

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.in	2001/11/06 02:57:37	1.6
+++ config.in	2001/11/20 18:00:58	1.7
@@ -11,10 +11,12 @@
 
 mainmenu_option next_comment
 comment 'Machine selection'
-choice 'Machine type'						\
-	"SGI-IP22,Indy/Indigo2 CONFIG_SGI_IP22			\
-	 SGI-IP27,Origin200/2000 CONFIG_SGI_IP27		\
-	 SGI-IP32,O2 CONFIG_SGI_IP32"  CONFIG_SGI_IP27
+bool '  Support for SGI-IP27 (Origin200/2000)' CONFIG_SGI_IP27
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   bool '  Support for SGI-IP22 (Indy/Indigo2)' CONFIG_SGI_IP22
+   bool '  Support for SGI-IP32 (O2)' CONFIG_SGI_IP32
+fi
+bool '  Support for SiByte SWARM board' CONFIG_SIBYTE_SWARM
 
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    bool '  IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
@@ -26,6 +28,9 @@
    bool '  Multi-Processing support' CONFIG_SMP
    #bool '  IP27 XXL' CONFIG_SGI_SN0_XXL
 fi
+if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
+   bool '  Multi-Processing support' CONFIG_SMP
+fi
 endmenu
 
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
@@ -46,10 +51,12 @@
 unset CONFIG_PCI
 
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
-   define_bool CONFIG_BOOT_ELF32 y
    define_bool CONFIG_ARC32 y
-   define_bool CONFIG_BOARD_SCACHE y
+   define_bool CONFIG_ARC_CONSOLE y
    define_bool CONFIG_ARC_MEMORY y
+   define_bool CONFIG_BOARD_SCACHE y
+   define_bool CONFIG_PC_KEYB y
+   define_bool CONFIG_BOOT_ELF32 y
    define_bool CONFIG_SGI y
    define_int CONFIG_L1_CACHE_SHIFT 5
 fi
@@ -75,6 +82,15 @@
    define_int CONFIG_L1_CACHE_SHIFT 5
 fi
 
+if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
+   define_bool CONFIG_BOOT_ELF64 y
+   define_bool CONFIG_COHERENT_IO y
+   define_bool CONFIG_SWAP_IO_SPACE y
+   define_bool CONFIG_CFE y
+   define_bool CONFIG_SIBYTE_SB1250 y
+   define_int CONFIG_L1_CACHE_SHIFT 5
+fi
+
 if [ "$CONFIG_ISA" != "y" ]; then
    define_bool CONFIG_ISA n
    define_bool CONFIG_EISA n
@@ -98,7 +114,8 @@
 	 R5000 CONFIG_CPU_R5000			\
 	 R52x0 CONFIG_CPU_NEVADA		\
 	 R8000 CONFIG_CPU_R8000			\
-	 R10000 CONFIG_CPU_R10000" R4x00
+	 R10000 CONFIG_CPU_R10000		\
+	 SB1   CONFIG_CPU_SB1" R4x00
 endmenu
 
 mainmenu_option next_comment