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

• Lines: 122
• Date: Sun Nov 15 10:51:42 1998
• Orig file: v2.1.128/linux/arch/ppc/config.in
• Orig date: Fri Oct 9 13:27:06 1998

diff -u --recursive --new-file v2.1.128/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -1,19 +1,9 @@
-# $Id: config.in,v 1.72 1998/10/01 14:09:40 cort Exp $
+# $Id: config.in,v 1.80 1998/11/11 03:54:56 paulus Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
 mainmenu_name "Linux/PowerPC Kernel Configuration"
 
-
-
-mainmenu_option next_comment
-comment 'Cross development support'
-  bool 'Build using cross development tools' CONFIG_CROSSCOMPILE 
-if [ "$CONFIG_CROSSCOMPILE" = "y" ]; then
-  string '  Prefix for cross devel tools' CROSS_COMPILE "ppc-linux-elf-"
-fi
-endmenu
-
 mainmenu_option next_comment
 comment 'Platform support'
 define_bool CONFIG_PPC y
@@ -28,16 +18,16 @@
 	 PowerMac/PReP/CHRP	CONFIG_ALL_PPC \
   	 APUS           CONFIG_APUS \
 	 MBX		CONFIG_MBX" PowerMac
+
+if [ "$CONFIG_ALL_PPC" != "y" ];then
+  define_bool CONFIG_MACH_SPECIFIC y
+fi
 endmenu
 
 if [ "$CONFIG_MBX" = "y" ];then
   define_bool CONFIG_SERIAL_CONSOLE y
 fi
 
-if [ "$CONFIG_ALL_PPC" != "y" ]; then
-  define_bool CONFIG_MACH_SPECIFIC y
-fi
-
 mainmenu_option next_comment
 comment 'General setup'
 
@@ -79,23 +69,23 @@
   fi
 fi
 
+bool 'Support for VGA Console' CONFIG_VGA_CONSOLE
 bool 'Support for frame buffer devices' CONFIG_FB
 if [ "$CONFIG_FB" = "y" ]; then
   bool 'Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC
 fi
-if [ "$CONFIG_FB" != "y" ]; then
-  bool 'Support for VGA Console' CONFIG_VGA_CONSOLE
-fi
 
 bool 'Power management support for PowerBook 3400/2400' CONFIG_PMAC_PBOOK
 bool 'Support for PowerMac keyboard' CONFIG_MAC_KEYBOARD
 bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
 bool 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
 bool 'Support for PowerMac ADB mouse' CONFIG_ADBMOUSE
+bool 'Support for PowerMac IDE devices (must also enable IDE)' CONFIG_BLK_DEV_IDE_PMAC
 bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
 bool 'Include kgdb kernel debugger' CONFIG_KGDB
 bool 'Include xmon kernel debugger' CONFIG_XMON
 bool 'Support for TotalImpact TotalMP' CONFIG_TOTALMP
+bool 'Support for early boot text console (BootX only)' CONFIG_BOOTX_TEXT
 
 if [ "$CONFIG_APUS" = "y" ]; then
   define_bool CONFIG_FB_CONSOLE y
@@ -105,6 +95,7 @@
   define_bool CONFIG_ABSTRACT_CONSOLE y
   define_bool CONFIG_FB y
   tristate 'Amiga builtin serial support' CONFIG_AMIGA_BUILTIN_SERIAL
+  tristate 'Parallel printer support' CONFIG_M68K_PRINTER
   tristate 'GVP IO-Extender support' CONFIG_GVPIOEXT
   dep_tristate 'GVP IO-Extender parallel printer support' CONFIG_GVPIOEXT_LP $CONFIG_GVPIOEXT
   dep_tristate 'GVP IO-Extender PLIP support' CONFIG_GVPIOEXT_PLIP $CONFIG_GVPIOEXT
@@ -113,7 +104,8 @@
        "$CONFIG_MULTIFACE_III_TTY" = "y" ]; then
     bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
   fi
-bool '/proc/hardware support' CONFIG_PROC_HARDWARE
+  bool 'Use power LED as a heartbeat' CONFIG_HEARTBEAT
+  bool '/proc/hardware support' CONFIG_PROC_HARDWARE
 fi
 
 endmenu
@@ -128,9 +120,7 @@
 
 mainmenu_option next_comment
 comment 'SCSI support'
-
 tristate 'SCSI support' CONFIG_SCSI
-
 if [ "$CONFIG_SCSI" != "n" ]; then
   source drivers/scsi/Config.in
 fi
@@ -173,22 +163,15 @@
 endmenu
 
 source drivers/char/Config.in
-
 source fs/Config.in
-
 source fs/nls/Config.in
 
 mainmenu_option next_comment
 comment 'Sound'
-
 tristate 'Sound card support' CONFIG_SOUND
 if [ "$CONFIG_SOUND" != "n" ]; then
-  if [ "$CONFIG_APUS" = "y" -o "$CONFIG_PMAC" = "y" ]; then
-     tristate 'Amiga or PowerMac DMA sound support' CONFIG_DMASOUND
-  fi
-  if [ "$CONFIG_PREP" = "y" -o "$CONFIG_CHRP" = "y" ]; then
-     source drivers/sound/Config.in
-  fi
+  tristate 'Amiga or PowerMac DMA sound support' CONFIG_DMASOUND
+  source drivers/sound/Config.in
 fi
 
 endmenu