patch-2.3.99-pre9 linux/arch/mips64/config.in

• Lines: 68
• Date: Sat May 13 08:30:17 2000
• Orig file: v2.3.99-pre8/linux/arch/mips64/config.in
• Orig date: Tue Apr 11 15:09:13 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips64/config.in linux/arch/mips64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.14 2000/02/18 11:06:20 ulfc Exp $
+# $Id: config.in,v 1.19 2000/03/27 01:44:45 ralf Exp $
 #
 # For a description of the syntax of this configuration file,
 # see the Configure script.
@@ -17,26 +17,23 @@
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    bool '  IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
    bool '  Discontiguous Memory Support' CONFIG_DISCONTIGMEM
+   bool '  Multi-Processing support (Experimental)' CONFIG_SMP
    #bool '  IP27 XXL' CONFIG_SGI_SN0_XXL
 fi
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   bool 'Symmetric Multi-Processing support' CONFIG_SMP
-fi
 endmenu
 
 #
 # Select some configuration options automatically based on user selections
 #
-unset CONFIG_BOOT_ELF32
-unset CONFIG_BOOT_ELF64
 unset CONFIG_ARC32
 unset CONFIG_ARC64
+unset CONFIG_BINFMT_ELF32
 unset CONFIG_BOARD_SCACHE
+unset CONFIG_BOOT_ELF32
+unset CONFIG_BOOT_ELF64
 unset CONFIG_COHERENT_IO
-unset CONFIG_BINFMT_ELF32
-
-define_bool CONFIG_ISA n
-define_bool CONFIG_SBUS n
+unset CONFIG_ISA
+unset CONFIG_PCI
 
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
    define_bool CONFIG_BOOT_ELF32 y
@@ -51,10 +48,18 @@
    define_bool CONFIG_COHERENT_IO y
    define_bool CONFIG_PCI y
    define_bool CONFIG_QL_ISP_A64 y
-else
+fi
+
+if [ "$CONFIG_ISA" != "y" ]; then
+   define_bool CONFIG_ISA n
+fi
+
+if [ "$CONFIG_PCI" != "y" ]; then
    define_bool CONFIG_PCI n
 fi
 
+define_bool CONFIG_SBUS n
+
 mainmenu_option next_comment
 comment 'CPU selection'
 
@@ -210,6 +215,8 @@
       tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE
       if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then
 	 define_bool CONFIG_DUMMY_CONSOLE y
+      else
+	 define_bool CONFIG_FONT_8x16 y
       fi
    fi
   endmenu