Merge with Linux 2.1.55. More bugfixes and goodies from my private

CVS archive.

1 files changed, 42 insertions, 17 deletions

diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 9df35fa24..1cea7ce3f 100644
--- a/arch/ppc/config.in
+++ b/arch/ppc/config.in
@@ -1,36 +1,44 @@
-#
+# $Id: config.in,v 1.19 1997/09/04 01:54:26 davem Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
 mainmenu_name "Linux/PowerPC Kernel Configuration"
 
-if [ "`uname`" != "Linux" ]; then
+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
 
-bool 'Build PowerMac Kernel (not PReP)?' CONFIG_PMAC
-bool 'Build PReP Kernel (not PowerMac)?' CONFIG_PREP
-bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
-bool 'Used Harddrive LED on IBM 83x workstations as heartbeat?' CONFIG_HEARTBEAT
-bool 'Used PowerPC specific powersaving?' CONFIG_POWERSAVING
+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
+
 choice 'Processor type' \
-	"Common		CONFIG_MCOMMON \
-	 601		CONFIG_M601	\
-	 603		CONFIG_M603	\
-	 604		CONFIG_M604" Common
+	"Common		CONFIG_COMMON \
+	 601		CONFIG_601	\
+	 603		CONFIG_603	\
+	 604		CONFIG_604" Common
+endmenu
+
+mainmenu_option next_comment
+comment 'General setup'
 
+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
 bool 'Enable loadable module support' CONFIG_MODULES
 if [ "$CONFIG_MODULES" = "y" ]; then
   bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS
   bool 'Kernel daemon support (e.g. autoload of modules)' CONFIG_KERNELD
 fi
 
-
-mainmenu_option next_comment
 define_bool CONFIG_PCI y
-bool 'PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE
+if [ "$CONFIG_PREP" = "y" ]; then
+  bool 'PCI bridge optimization' CONFIG_PCI_OPTIMIZE
+fi
 bool 'Networking support' CONFIG_NET
 bool 'Sysctl support' CONFIG_SYSCTL
 bool 'System V IPC' CONFIG_SYSVIPC
@@ -39,8 +47,24 @@ bool 'System V IPC' CONFIG_SYSVIPC
 define_bool CONFIG_BINFMT_ELF y
 define_bool CONFIG_KERNEL_ELF y
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-tristate 'Kernel support for JAVA binaries' CONFIG_BINFMT_JAVA
+tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA
+
+if [ "$CONFIG_PMAC" = "y" ]; then
+  define_bool CONFIG_PMAC_CONSOLE y
+  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
+fi
+
+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
+else
+  define_bool CONFIG_VGA_CONSOLE y
+fi
 
+endmenu
 
 source drivers/pnp/Config.in
 source drivers/block/Config.in
@@ -83,6 +107,7 @@ fi
 endmenu
 
 source fs/Config.in
+
 source drivers/char/Config.in
 
 mainmenu_option next_comment
@@ -93,12 +118,12 @@ if [ "$CONFIG_SOUND" != "n" ]; then
 fi
 endmenu
 
-mainmenu_option next_comment
+#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
+#endmenu