patch-2.1.79 linux/arch/ppc/config.in

• Lines: 164
• Date: Mon Jan 12 15:18:13 1998
• Orig file: v2.1.78/linux/arch/ppc/config.in
• Orig date: Thu Dec 4 14:53:54 1997

diff -u --recursive --new-file v2.1.78/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.19 1997/09/04 01:54:26 davem Exp $
+# $Id: config.in,v 1.36 1997/12/29 21:36:52 geert Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
@@ -7,13 +7,13 @@
 mainmenu_option next_comment
 comment 'Platform support'
 define_bool CONFIG_PPC y
-
 if [ "`uname`" != "Linux" -o "`uname -m`" != "ppc" ]; then
   define_bool CONFIG_CROSSCOMPILE y
 else
   define_bool CONFIG_NATIVE y
 fi
 
+define_bool CONFIG_MACH_SPECIFIC y
 bool 'Build PowerMac Kernel (not PReP or CHRP)?' CONFIG_PMAC
 bool 'Build PReP Kernel (not PowerMac or CHRP)?' CONFIG_PREP
 bool 'Build CHRP Kernel (not PReP or PowerMac)?' CONFIG_CHRP
@@ -39,9 +39,11 @@
 if [ "$CONFIG_PREP" = "y" ]; then
   bool 'PCI bridge optimization' CONFIG_PCI_OPTIMIZE
 fi
+bool 'Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC
 bool 'Networking support' CONFIG_NET
 bool 'Sysctl support' CONFIG_SYSCTL
 bool 'System V IPC' CONFIG_SYSVIPC
+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
 
 # only elf supported, a.out is not -- Cort
 define_bool CONFIG_BINFMT_ELF y
@@ -49,39 +51,77 @@
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA
 
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'New unified console driver (EXPERIMENTAL)' CONFIG_ABSTRACT_CONSOLE
+fi
+
 if [ "$CONFIG_PMAC" = "y" ]; then
-  define_bool CONFIG_PMAC_CONSOLE y
+  if [ "$CONFIG_ABSTRACT_CONSOLE" = "y" ]; then
+    define_bool CONFIG_FB y
+    bool 'Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC
+  else
+    define_bool CONFIG_PMAC_CONSOLE y
+  fi
   define_bool CONFIG_MAC_KEYBOARD y
   define_bool CONFIG_MAC_FLOPPY	y
-  bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
-  bool 'Include xmon kernel debugger' CONFIG_XMON
+else
+# if compiling specifically for prep or chrp, or supporting all arch's
+  if [ "$CONFIG_ABSTRACT_CONSOLE" = "y" ]; then
+    bool 'Support for frame buffer devices' CONFIG_FB
+    bool 'Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC
+  else
+    bool 'Support for PowerMac console' CONFIG_PMAC_CONSOLE
+  fi
+  bool 'Support for PowerMac keyboard' CONFIG_MAC_KEYBOARD
+  bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
+fi
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'Support for PowerMac mouse (EXPERIMENTAL)' CONFIG_MACMOUSE
 fi
+bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
+bool 'Include xmon kernel debugger' CONFIG_XMON
 
-if [ "$CONFIG_PMAC_CONSOLE" = "y" ]; then
-  bool 'Support for ATI Mach64 display cards' CONFIG_ATY_VIDEO
-  bool 'Support for IMS Twin Turbo display card' CONFIG_IMSTT_VIDEO
+if [ "$CONFIG_ABSTRACT_CONSOLE" = "y" ]; then
+  if [ "$CONFIG_FB" != "y" ]; then
+    define_bool CONFIG_VGA_CONSOLE y
+  fi
 else
-  define_bool CONFIG_VGA_CONSOLE y
+  if [ "$CONFIG_PMAC_CONSOLE" = "y" ]; then
+    bool 'Support for Apple "control" display' CONFIG_CONTROL_VIDEO
+    bool 'Support for Apple "platinum" display' CONFIG_PLATINUM_VIDEO
+    bool 'Support for Apple "valkyrie" display' CONFIG_VALKYRIE_VIDEO
+    bool 'Support for ATI Mach64 display cards' CONFIG_ATY_VIDEO
+    bool 'Support for IMS Twin Turbo display card' CONFIG_IMSTT_VIDEO
+    bool 'Support for Chips 65550 display' CONFIG_CHIPS_VIDEO
+  else
+    define_bool CONFIG_VGA_CONSOLE y
+  fi
 fi
 
 endmenu
 
 source drivers/pnp/Config.in
 source drivers/block/Config.in
+source drivers.new/Config.in
+
+if [ "$CONFIG_NET" = "y" ]; then
+  source net/Config.in
+fi
 
 mainmenu_option next_comment
 comment 'SCSI support'
+
 tristate 'SCSI support' CONFIG_SCSI
+
 if [ "$CONFIG_SCSI" != "n" ]; then
   source drivers/scsi/Config.in
 fi
 endmenu
 
-
 if [ "$CONFIG_NET" = "y" ]; then
   mainmenu_option next_comment
   comment 'Network device support'
-  source net/Config.in
+
   bool 'Network device support' CONFIG_NETDEVICES
   if [ "$CONFIG_NETDEVICES" = "y" ]; then
     source drivers/net/Config.in
@@ -93,6 +133,7 @@
 
 mainmenu_option next_comment
 comment 'ISDN subsystem'
+
 tristate 'ISDN support' CONFIG_ISDN
 if [ "$CONFIG_ISDN" != "n" ]; then
   source drivers/isdn/Config.in
@@ -101,6 +142,7 @@
 
 mainmenu_option next_comment
 comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'
+
 bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
 if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
   source drivers/cdrom/Config.in
@@ -122,22 +164,17 @@
 
 source fs/nls/Config.in
 
+if [ "$CONFIG_ABSTRACT_CONSOLE" = "y" ]; then
+  source drivers/video/Config.in
+fi
+
 source drivers/char/Config.in
 
 mainmenu_option next_comment
 comment 'Sound'
+
 tristate 'Sound card support' CONFIG_SOUND
 if [ "$CONFIG_SOUND" != "n" ]; then
   source drivers/sound/Config.in
 fi
 endmenu
-
-#mainmenu_option next_comment
-#comment 'Kernel hacking'
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-#bool 'Kernel profiling support' CONFIG_PROFILE
-#if [ "$CONFIG_PROFILE" = "y" ]; then
-#  int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-#fi
-#endmenu
-