patch-2.2.11 linux/arch/mips/config.in

Next file: linux/arch/mips/dec/Makefile
Previous file: linux/arch/mips/boot/elf2ecoff.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.10/linux/arch/mips/config.in linux/arch/mips/config.in
@@ -14,6 +14,8 @@
 bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
   bool 'Support for Algorithmics P4032' CONFIG_ALGOR_P4032
+  bool 'Support for BAGET MIPS series' CONFIG_BAGET_MIPS
+  bool 'Support for DECstations' CONFIG_DECSTATION
 fi
 bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
 bool 'Support for Olivetti M700-10' CONFIG_OLIVETTI_M700
@@ -33,14 +35,13 @@
 if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
      "$CONFIG_OLIVETTI_M700" = "y" ]; then
 	define_bool CONFIG_MIPS_JAZZ y
-	define_bool CONFIG_VIDEO_G364 y
-	define_bool CONFIG_VGA_CONSOLE y
+	define_bool CONFIG_FB y
+	define_bool CONFIG_FB_G364 y	
 fi
 if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
 	define_bool CONFIG_MIPS_JAZZ y
 fi
 if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then
-	define_bool CONFIG_VGA_CONSOLE y
 	define_bool CONFIG_PCI y
 fi
 endmenu
@@ -61,14 +62,23 @@
 
 mainmenu_option next_comment
 comment 'General setup'
+
+if [ "$CONFIG_PCI" = "y" ]; then
+  bool '   PCI quirks' CONFIG_PCI_QUIRKS
+  if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+    bool '   PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE
+  fi
+  bool '   Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC
+fi
+
 if [ "$CONFIG_DECSTATION" = "y" ]; then
-  bool 'Compile the kernel into the ECOFF object format' CONFIG_ECOFF_KERNEL
   define_bool CONFIG_CPU_LITTLE_ENDIAN y
 else
-  define_bool CONFIG_ELF_KERNEL y
   bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN
 fi
 
+define_bool CONFIG_ELF_KERNEL y
+
 if [ "$CONFIG_CPU_LITTLE_ENDIAN" = "n" ]; then
   define_bool CONFIG_BINFMT_IRIX y
   define_bool CONFIG_FORWARD_KEYBOARD y
@@ -77,7 +87,6 @@
 define_bool CONFIG_BINFMT_ELF y
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
   tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA
 fi
 
@@ -86,7 +95,7 @@
 bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
 bool 'Sysctl support' CONFIG_SYSCTL
 
-if [ "$CONFIG_SGI" != "y" ]; then
+if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
   tristate 'Parallel port support' CONFIG_PARPORT
 fi
 endmenu
@@ -105,6 +114,16 @@
 
 endmenu
 
+if [ "$CONFIG_DECSTATION" = "y" ]; then
+	mainmenu_option next_comment
+	comment 'TURBOchannel support'
+		bool 'TURBOchannel support' CONFIG_TC
+#		if [ "$CONFIG_TC" = "y" ]; then
+# 			tristate 'MAGMA Parallel port support' CONFIG_PARPORT
+#		fi
+	endmenu
+fi
+
 source drivers/block/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
@@ -117,7 +136,7 @@
 tristate 'SCSI support' CONFIG_SCSI
 
 if [ "$CONFIG_SCSI" != "n" ]; then
-	if [ "$CONFIG_SGI" = "y" ]; then
+	if [ "$CONFIG_SGI" = "y" -o "$CONFIG_DECSTATION" = "y" ]; then
 		comment 'SCSI support type (disk, tape, CDrom)'
 
 		dep_tristate 'SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI
@@ -133,9 +152,15 @@
 
 		#mainmenu_option next_comment
 		comment 'SCSI low-level drivers'
-
+		if [ "$CONFIG_SGI" = "y" ]; then
 		dep_tristate 'SGI wd93 Scsi Driver' CONFIG_SCSI_SGIWD93 $CONFIG_SCSI
 	else
+			if [ "$CONFIG_TC" = "y" ]; then
+				dep_tristate 'DEC NCR53C94 Scsi Driver' CONFIG_SCSI_DECNCR $CONFIG_SCSI
+			fi
+			dep_tristate 'DEC SII Scsi Driver' CONFIG_SCSI_DECSII $CONFIG_SCSI
+		fi
+	else
 		source drivers/scsi/Config.in
 	fi
 fi
@@ -147,7 +172,7 @@
 
   bool 'Network device support' CONFIG_NETDEVICES
   if [ "$CONFIG_NETDEVICES" = "y" ]; then
-    if [ "$CONFIG_SGI" != "y" ]; then
+    if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
 	source drivers/net/Config.in
     else
 	tristate 'Dummy net driver support' CONFIG_DUMMY
@@ -160,52 +185,113 @@
 	if [ ! "$CONFIG_PPP" = "n" ]; then
 	  comment 'CCP compressors for PPP are only built as modules.'
 	fi
+        if [ "$CONFIG_SGI" = "y" ]; then
 	bool 'SGI Seeq ethernet controller support' CONFIG_SGISEEQ
     fi
+	if [ "$CONFIG_DECSTATION" = "y" ]; then
+          bool 'DEC LANCE ethernet controller support' CONFIG_DECLANCE
+        fi
+	if [ "$CONFIG_BAGET_MIPS" = "y" ]; then
+	  tristate 'Baget AMD LANCE support' CONFIG_BAGETLANCE
+	  tristate 'Baget Backplane Shared Memory support' CONFIG_BAGETBSM
+	fi
+    fi
   fi
   endmenu
 fi
 
-if [ "$CONFIG_SGI" != "y" ]; then
-	source drivers/net/hamradio/Config.in
+if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
+  source drivers/net/hamradio/Config.in
 
-	mainmenu_option next_comment
-	comment 'ISDN subsystem'
 
-	tristate 'ISDN support' CONFIG_ISDN
-	if [ "$CONFIG_ISDN" != "n" ]; then
-	  source drivers/isdn/Config.in
-	fi
-	endmenu
+  mainmenu_option next_comment
+  comment 'ISDN subsystem'
 
-	mainmenu_option next_comment
-	comment 'Old CD-ROM drivers (not SCSI, not IDE)'
+  if [ "$CONFIG_NET" != "n" ]; then
+    tristate 'ISDN support' CONFIG_ISDN
+    if [ "$CONFIG_ISDN" != "n" ]; then
+      source drivers/isdn/Config.in
+    fi
+  fi
+  endmenu
 
-	bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
-	if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
-	  source drivers/cdrom/Config.in
-	fi
-	endmenu
+
+  mainmenu_option next_comment
+  comment comment 'Old CD-ROM drivers (not SCSI, not IDE)'
+
+  bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
+  if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
+    source drivers/cdrom/Config.in
+  fi
+  endmenu
+fi
+
+if [ "$CONFIG_DECSTATION" != "y" ]; then
+  source drivers/char/Config.in
+else
+  mainmenu_option next_comment
+  comment 'DECstation Character devices'
+
+  bool 'Virtual terminal' CONFIG_VT
+  if [ "$CONFIG_VT" = "y" ]; then
+    bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
+  fi
+  tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
+  if [ "$CONFIG_SGI" = "y" ]; then
+    bool 'SGI PROM Console Support' CONFIG_SGI_PROM_CONSOLE
+  fi
+  if [ "$CONFIG_SERIAL" = "y" ]; then
+    bool 'DZ11 Serial Support' CONFIG_DZ
+    if [ "$CONFIG_TC" = "y" ]; then
+      bool 'Z85C30 Serial Support' CONFIG_ZS
+    fi
+    bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
+  fi
+  bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
+  if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
+    int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
+  fi
+  bool 'Keyboard Support' CONFIG_KEYBOARD
+  bool 'Mouse Support' CONFIG_MOUSE
+#    bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+  endmenu
 fi
 
-source drivers/char/Config.in
+# source drivers/usb/Config.in
 
 source fs/Config.in
 
-comment 'Console drivers'
-source drivers/video/Config.in
+if [ "$CONFIG_VT" = "y" ]; then
+  mainmenu_option next_comment
+  comment 'Console drivers'
+  if [ "$CONFIG_SGI" = "y" ]; then
+    tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE
+    if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then
+      define_bool CONFIG_DUMMY_CONSOLE y
+    fi
+  else
+    if [ "$CONFIG_DECSTATION" != "y" ]; then
+    bool 'VGA text console' CONFIG_VGA_CONSOLE
+    fi
+    bool 'Support for frame buffer devices' CONFIG_FB
+    source drivers/video/Config.in
+  fi
+  endmenu
+fi
 
-mainmenu_option next_comment
-comment 'Sound'
+if [ "$CONFIG_DECSTATION" != "y" ]; then
+  mainmenu_option next_comment
+  comment 'Sound'
 
-tristate 'Sound card support' CONFIG_SOUND
-if [ "$CONFIG_SOUND" != "n" ]; then
+  tristate 'Sound card support' CONFIG_SOUND
+  if [ "$CONFIG_SOUND" != "n" ]; then
   source drivers/sound/Config.in
+  fi
+  endmenu
 fi
-endmenu
 
 if [ "$CONFIG_SGI" = "y" ]; then
-  source drivers/sgi/char/Config.in
+  source drivers/sgi/Config.in
 fi
 
 mainmenu_option next_comment
@@ -216,6 +302,8 @@
 if [ "$CONFIG_MODULES" = "y" ]; then
   bool ' Build fp execption handler module' CONFIG_MIPS_FPE_MODULE
 fi
-bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
+if [ "$CONFIG_SERIAL" = "y" ]; then
+  bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
+fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)