Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips config.in,1.53,1.54 defconfig,1.15,1.16
|
From: James S. <jsi...@us...> - 2001-11-26 18:31:27
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv9534
Modified Files:
config.in defconfig
Log Message:
Config changes for IP22 timer updates were missing; this gets it to compile again.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- config.in 2001/11/22 01:19:24 1.53
+++ config.in 2001/11/26 18:31:24 1.54
@@ -61,17 +61,6 @@
int ' Maximum memory chunks' CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS 16
bool ' Multi-Processing support' CONFIG_SMP
fi
- if [ "$CONFIG_BLK_DEV_INITRD" = "y" ]; then
- bool ' Embed root filesystem ramdisk into the kernel' CONFIG_EMBEDDED_RAMDISK
- if [ "$CONFIG_EMBEDDED_RAMDISK" = "y" ]; then
- choice ' Ramdisk Image to use for root filesystem' \
- "Simple-init CONFIG_SIBYTE_RAMDISK_SIMPLE_INIT \
- General CONFIG_SIBYTE_RAMDISK_GENERAL \
- Promice-console CONFIG_SIBYTE_RAMDISK_PROMICE_CONSOLE\
- N+I-demo CONFIG_SIBYTE_RAMDISK_NIDEMO\
- Screening CONFIG_SIBYTE_RAMDISK_SCREENING" General
- fi
- fi
fi
fi
bool 'Support for Sony PlayStation 2' CONFIG_PS2
@@ -87,14 +76,14 @@
bool 'Support for SGI IP22' CONFIG_SGI_IP22
bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI
bool 'Support for ITE 8172G board' CONFIG_MIPS_ITE8172
- if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
- bool ' Support for older IT8172 (Rev C)' CONFIG_IT8172_REVC
- fi
- bool 'Support for Globespan IVR board' CONFIG_MIPS_IVR
+if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
+ bool ' Support for older IT8172 (Rev C)' CONFIG_IT8172_REVC
+fi
+bool 'Support for Globespan IVR board' CONFIG_MIPS_IVR
bool 'Support for Alchemy Semi PB1000 board' CONFIG_MIPS_PB1000
- if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
- bool ' Support for PCI AUTO Config' CONFIG_PCI_AUTO
- fi
+if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
+ bool ' Support for PCI AUTO Config' CONFIG_PCI_AUTO
+fi
bool 'Support for Hewlett Packard LaserJet board' CONFIG_HP_LASERJET
bool 'Support for Toshiba JMR-TX3927 board' CONFIG_TOSHIBA_JMR3927
@@ -106,7 +95,6 @@
#
unset CONFIG_ARC32
unset CONFIG_BOARD_SCACHE
-unset CONFIG_COHERENT_IO
unset CONFIG_HAVE_STD_PC_SERIAL_PORT
unset CONFIG_I8259
unset CONFIG_ISA
@@ -120,7 +108,6 @@
define_bool CONFIG_SBUS n
if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
- define_bool CONFIG_COHERENT_IO y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_PCI n
define_bool CONFIG_SWAP_IO_SPACE y
@@ -131,17 +118,20 @@
define_bool CONFIG_MIPS_GT96100 y
define_bool CONFIG_SWAP_IO_SPACE y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI_AUTO y
fi
if [ "$CONFIG_MIPS_EV64120" = "y" ]; then
define_bool CONFIG_PCI y
define_bool CONFIG_ISA n
define_bool CONFIG_MIPS_GT64120 y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_ALGOR_P4032" = "y" ]; then
define_bool CONFIG_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
@@ -152,6 +142,7 @@
define_bool CONFIG_FB y
define_bool CONFIG_FB_G364 y
define_bool CONFIG_MIPS_JAZZ y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_OLD_TIME_C y
fi
@@ -165,6 +156,7 @@
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_MIPS_ATLAS" = "y" ]; then
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI y
define_bool CONFIG_SWAP_IO_SPACE y
fi
@@ -173,6 +165,7 @@
define_bool CONFIG_PCI y
define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_SWAP_IO_SPACE y
fi
if [ "$CONFIG_MOMENCO_OCELOT" = "y" ]; then
@@ -180,32 +173,37 @@
define_bool CONFIG_SYSCLK_100 y
define_bool CONFIG_SWAP_IO_SPACE y
define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_NEW_TIME_C y
fi
if [ "$CONFIG_SGI_IP22" = "y" ]; then
define_bool CONFIG_ARC32 y
define_bool CONFIG_BOARD_SCACHE y
+ define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_SGI y
define_bool CONFIG_NEW_IRQ y
- define_bool CONFIG_OLD_TIME_C y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
fi
if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then
define_bool CONFIG_ARC32 y
define_bool CONFIG_I8259 y
define_bool CONFIG_ISA y
define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_OLD_TIME_C y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_PCI y
- define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_DDB5074" = "y" ]; then
+ define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
define_bool CONFIG_I8259 y
define_bool CONFIG_ISA y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_ROTTEN_IRQ y
- define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_DDB5476" = "y" ]; then
@@ -219,6 +217,7 @@
define_bool CONFIG_NEW_PCI y
define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
fi
if [ "$CONFIG_DDB5477" = "y" ]; then
define_bool CONFIG_PCI y
@@ -226,6 +225,7 @@
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_DUMMY_KEYB y
fi
@@ -237,6 +237,7 @@
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_DUMMY_KEYB y
define_bool CONFIG_SCSI n
fi
@@ -246,6 +247,7 @@
define_bool CONFIG_VRC4173 y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_DUMMY_KEYB y
define_bool CONFIG_PCI y
fi
@@ -255,6 +257,7 @@
define_bool CONFIG_SERIAL_MANY_PORTS y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_SCSI n
fi
if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
@@ -262,6 +265,7 @@
define_bool CONFIG_IT8712 y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_IT8172_CIR y
define_bool CONFIG_NEW_IRQ y
@@ -271,6 +275,7 @@
define_bool CONFIG_PCI y
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_IT8172_CIR y
define_bool CONFIG_NEW_IRQ y
@@ -281,6 +286,7 @@
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_PCI y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
define_int MAX_HWIFS 1
fi
@@ -294,6 +300,7 @@
define_bool CONFIG_PCI y
# define_bool CONFIG_NEW_PCI y
# define_bool CONFIG_PCI_AUTO y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_VADEM_CLIO_1000" = "y" ]; then
@@ -310,6 +317,7 @@
if [ "$CONFIG_NINO" = "y" ]; then
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
fi
if [ "$CONFIG_PS2" = "y" ]; then
@@ -329,15 +337,19 @@
define_bool CONFIG_VRC4173 y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_DUMMY_KEYB y
define_bool CONFIG_PCI y
fi
if [ "$CONFIG_HP_LASERJET" = "y" ]; then
define_bool CONFIG_PCI y
+ define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_PCI y
#not yet define_bool CONFIG_PCI_AUTO y
fi
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
@@ -400,6 +412,7 @@
if [ "$CONFIG_CPU_SB1" = "y" ]; then
bool ' Workarounds for pass 1 sb1 bugs' CONFIG_SB1_PASS_1_WORKAROUNDS
bool ' Support for SB1 Cache Error handler' CONFIG_SB1_CACHE_ERROR
+ define_bool CONFIG_VTAG_ICACHE y
fi
bool 'Override CPU Options' CONFIG_CPU_ADVANCED
@@ -501,6 +514,9 @@
source drivers/parport/Config.in
source drivers/block/Config.in
+if [ "$CONFIG_BLK_DEV_INITRD" = "y" ]; then
+ bool ' Embed root filesystem ramdisk into the kernel' CONFIG_EMBEDDED_RAMDISK
+fi
source drivers/md/Config.in
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- defconfig 2001/11/19 18:31:01 1.15
+++ defconfig 2001/11/26 18:31:24 1.16
@@ -2,7 +2,6 @@
# Automatically generated make config: don't edit
#
CONFIG_MIPS=y
-# CONFIG_SMP is not set
#
# Code maturity level options
@@ -15,7 +14,6 @@
# CONFIG_ACER_PICA_61 is not set
# CONFIG_ALGOR_P4032 is not set
# CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
# CONFIG_DECSTATION is not set
# CONFIG_DDB5074 is not set
# CONFIG_MIPS_EV96100 is not set
@@ -24,20 +22,18 @@
# CONFIG_MIPS_MALTA is not set
# CONFIG_NINO is not set
# CONFIG_SIBYTE_SB1250 is not set
-# CONFIG_PS2 is not set
# CONFIG_MIPS_MAGNUM_4000 is not set
# CONFIG_MOMENCO_OCELOT is not set
# CONFIG_DDB5476 is not set
# CONFIG_DDB5477 is not set
# CONFIG_NEC_OSPREY is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
# CONFIG_OLIVETTI_M700 is not set
CONFIG_SGI_IP22=y
# CONFIG_SNI_RM200_PCI is not set
# CONFIG_MIPS_ITE8172 is not set
# CONFIG_MIPS_IVR is not set
# CONFIG_MIPS_PB1000 is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
# CONFIG_HP_LASERJET is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
@@ -45,10 +41,12 @@
# CONFIG_SBUS is not set
CONFIG_ARC32=y
CONFIG_BOARD_SCACHE=y
+CONFIG_IRQ_CPU=y
CONFIG_PC_KEYB=y
CONFIG_SGI=y
CONFIG_NEW_IRQ=y
-CONFIG_OLD_TIME_C=y
+CONFIG_NEW_TIME_C=y
+CONFIG_NONCOHERENT_IO=y
# CONFIG_ISA is not set
# CONFIG_EISA is not set
# CONFIG_PCI is not set
@@ -73,7 +71,6 @@
# CONFIG_CPU_TX49XX is not set
CONFIG_CPU_R5000=y
# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5900 is not set
# CONFIG_CPU_RM7000 is not set
# CONFIG_CPU_NEVADA is not set
# CONFIG_CPU_R10000 is not set
@@ -250,7 +247,6 @@
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR_D700 is not set
# CONFIG_SCSI_NCR53C7xx is not set
# CONFIG_SCSI_PAS16 is not set
# CONFIG_SCSI_PCI2000 is not set
@@ -399,7 +395,6 @@
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
#
# Ftape, the floppy tape device driver
|
