Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64
In directory usw-pr-cvs1:/tmp/cvs-serv29363/linux/arch/ppc64
Modified Files:
config.in
Log Message:
Synced to 2.5.20.
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.in 3 May 2002 22:16:46 -0000 1.5
+++ config.in 4 Jun 2002 19:45:05 -0000 1.6
@@ -5,7 +5,6 @@
define_bool CONFIG_UID16 n
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK n
define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y
-define_bool CONFIG_GENERIC_BUST_SPINLOCK n
define_bool CONFIG_GENERIC_ISA_DMA y
define_bool CONFIG_HAVE_DEC_LOCK y
@@ -30,8 +29,6 @@
if [ "$CONFIG_PPC_ISERIES" = "y" ]; then
define_bool CONFIG_MSCHUNKS y
-else
-bool 'MsChunks Physical to Absolute address translation support' CONFIG_MSCHUNKS
fi
endmenu
@@ -70,6 +67,11 @@
if [ "$CONFIG_PPC_ISERIES" != "y" ]; then
bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
+
+ bool 'Default bootloader kernel arguments' CONFIG_CMDLINE_BOOL
+ if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then
+ string 'Initial kernel command string' CONFIG_CMDLINE "console=ttyS0,9600 console=tty0 root=/dev/sda2"
+ fi
fi
endmenu
@@ -103,8 +105,12 @@
fi
endmenu
+source drivers/message/fusion/Config.in
+
source drivers/ieee1394/Config.in
+source drivers/message/i2o/Config.in
+
if [ "$CONFIG_NET" = "y" ]; then
mainmenu_option next_comment
comment 'Network device support'
@@ -178,6 +184,9 @@
fi
source drivers/char/Config.in
+
+source drivers/media/Config.in
+
source fs/Config.in
mainmenu_option next_comment
@@ -191,13 +200,21 @@
source drivers/usb/Config.in
+source net/bluetooth/Config.in
+
mainmenu_option next_comment
comment 'Kernel hacking'
-bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
-bool 'Include kgdb kernel debugger' CONFIG_KGDB
-bool 'Include xmon kernel debugger' CONFIG_XMON
-bool 'Include PPCDBG realtime debugging' CONFIG_PPCDBG
+bool 'Kernel debugging' CONFIG_DEBUG_KERNEL
+if [ "$CONFIG_DEBUG_KERNEL" != "n" ]; then
+ bool ' Debug memory allocations' CONFIG_DEBUG_SLAB
+ bool ' Magic SysRq key' CONFIG_MAGIC_SYSRQ
+ bool ' Include xmon kernel debugger' CONFIG_XMON
+ if [ "$CONFIG_XMON" = "y" ]; then
+ bool ' Enable xmon by default' CONFIG_XMON_DEFAULT
+ fi
+ bool ' Include PPCDBG realtime debugging' CONFIG_PPCDBG
+fi
endmenu
source lib/Config.in
|
