Update of /cvsroot/linuxconsole/ruby/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv25708/linux/arch/mips
Modified Files:
config.in
Log Message:
Synced to 2.4.10
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/config.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- config.in 2001/07/08 00:41:51 1.13
+++ config.in 2001/10/06 16:11:12 1.14
@@ -74,6 +74,7 @@
#
unset CONFIG_ARC32
unset CONFIG_BOARD_SCACHE
+unset CONFIG_COHERENT_IO
unset CONFIG_HAVE_STD_PC_SERIAL_PORT
unset CONFIG_I8259
unset CONFIG_ISA
@@ -89,6 +90,8 @@
define_bool CONFIG_PCI y
define_bool CONFIG_MIPS_GT96100 y
define_bool CONFIG_SWAP_IO_SPACE y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
fi
if [ "$CONFIG_MIPS_EV64120" = "y" ]; then
define_bool CONFIG_PCI y
@@ -127,6 +130,7 @@
define_bool CONFIG_I8259 y
define_bool CONFIG_PCI y
define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
+ define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_SWAP_IO_SPACE y
fi
if [ "$CONFIG_MOMENCO_OCELOT" = "y" ]; then
@@ -151,7 +155,7 @@
define_bool CONFIG_ROTTEN_IRQ y
define_bool CONFIG_OLD_TIME_C y
fi
-if [ "$CONFIG_DDB5074" = "y"]; then
+if [ "$CONFIG_DDB5074" = "y" ]; then
define_bool CONFIG_I8259 y
define_bool CONFIG_ISA y
define_bool CONFIG_PCI y
@@ -160,7 +164,6 @@
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_DDB5476" = "y" ]; then
- define_bool CONFIG_I8259 y
define_bool CONFIG_ISA y
define_bool CONFIG_PCI y
define_bool CONFIG_ROTTEN_IRQ y
@@ -176,6 +179,8 @@
if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
define_bool CONFIG_PCI y
define_bool CONFIG_IT8712 y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
fi
if [ "$CONFIG_MIPS_IVR" = "y" ]; then
define_bool CONFIG_PCI y
@@ -216,33 +221,45 @@
choice 'CPU type' \
"R3000 CONFIG_CPU_R3000 \
R6000 CONFIG_CPU_R6000 \
+ R41xx CONFIG_CPU_VR41XX \
R4300 CONFIG_CPU_R4300 \
R4x00 CONFIG_CPU_R4X00 \
R5000 CONFIG_CPU_R5000 \
- R5432 CONFIG_CPU_R5432 \
+ R5432 CONFIG_CPU_R5432 \
RM7000 CONFIG_CPU_RM7000 \
R52xx CONFIG_CPU_NEVADA \
R10000 CONFIG_CPU_R10000 \
SB1 CONFIG_CPU_SB1 \
- MIPS32 CONFIG_CPU_MIPS32" R4x00
+ MIPS32 CONFIG_CPU_MIPS32 \
+ MIPS64 CONFIG_CPU_MIPS64" R4x00
bool 'Override CPU Options' CONFIG_CPU_ADVANCED
if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then
bool ' ll/sc Instructions available' CONFIG_CPU_HAS_LLSC
+ bool ' lld/scd Instructions available' CONFIG_CPU_HAS_LLDSCD
bool ' Writeback Buffer available' CONFIG_CPU_HAS_WB
else
- if [ "$CONFIG_CPU_R3000" = "y" ]; then
- if [ "$CONFIG_DECSTATION" = "y" ]; then
+ if [ "$CONFIG_CPU_R3000" = "y" -o "$CONFIG_CPU_VR41XX" = "y" ]; then
+ if [ "CONFIG_DECSTATION" = "y" ]; then
define_bool CONFIG_CPU_HAS_LLSC n
+ define_bool CONFIG_CPU_HAS_LLDSCD n
define_bool CONFIG_CPU_HAS_WB y
else
define_bool CONFIG_CPU_HAS_LLSC n
+ define_bool CONFIG_CPU_HAS_LLDSCD n
define_bool CONFIG_CPU_HAS_WB n
fi
else
+ if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
+ define_bool CONFIG_CPU_HAS_LLSC y
+ define_bool CONFIG_CPU_HAS_LLDSCD n
+ define_bool CONFIG_CPU_HAS_WB n
+ else
define_bool CONFIG_CPU_HAS_LLSC y
+ define_bool CONFIG_CPU_HAS_LLDSCD y
define_bool CONFIG_CPU_HAS_WB n
+ fi
fi
fi
endmenu
@@ -257,7 +274,6 @@
else
bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN
fi
-bool 'Kernel floating-point emulation' CONFIG_MIPS_FPU_EMULATOR
if [ "$CONFIG_PROC_FS" = "y" ]; then
define_bool CONFIG_KCORE_ELF y
@@ -348,7 +364,7 @@
if [ "$CONFIG_DECSTATION" != "y" -a \
"$CONFIG_SGI_IP22" != "y" ]; then
- source drivers/message/i2o/Config.in
+ source drivers/i2o/Config.in
fi
if [ "$CONFIG_NET" = "y" ]; then
@@ -428,7 +444,6 @@
fi
source fs/Config.in
-
source drivers/video/Config.in
if [ "$CONFIG_DECSTATION" != "y" ]; then
@@ -450,9 +465,6 @@
comment 'Kernel hacking'
bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE
-if [ "$CONFIG_MODULES" = "y" ]; then
- bool ' Build fp execption handler module' CONFIG_MIPS_FPE_MODULE
-fi
if [ "$CONFIG_SERIAL" = "y" -o "$CONFIG_AU1000_UART" = "y" ]; then
bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
dep_bool 'Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_REMOTE_DEBUG
|
