[src/sommerfeld_i386mp_1]: src/sys/arch/i386/conf Catch up to -current

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b7b54dc58df
branches:  sommerfeld_i386mp_1
changeset: 482316:2b7b54dc58df
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sat Nov 18 23:25:50 2000 +0000

description:
Catch up to -current

diffstat:

 sys/arch/i386/conf/GENERIC    |   6 +++---
 sys/arch/i386/conf/files.i386 |  35 +++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diffs (129 lines):

diff -r b1ab410eb6f6 -r 2b7b54dc58df sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Nov 18 23:17:34 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Nov 18 23:25:50 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.300.2.8 2000/08/25 00:40:06 sommerfeld Exp $
+#      $NetBSD: GENERIC,v 1.300.2.9 2000/11/18 23:25:50 sommerfeld Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.300.2.8 $"
+#ident                 "GENERIC-$Revision: 1.300.2.9 $"
 
 maxusers       32              # estimated number of users
 
@@ -458,7 +458,7 @@
 
 # RAID controllers and devices
 cac*   at pci? dev ? function ?        # Compaq array controller
-ca*    at cac? unit ?                  # Compaq array disk device
+lsu*   at cac? unit ?                  # Compaq array disk device
 
 
 # IDE and related devices
diff -r b1ab410eb6f6 -r 2b7b54dc58df sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Sat Nov 18 23:17:34 2000 +0000
+++ b/sys/arch/i386/conf/files.i386     Sat Nov 18 23:25:50 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.147.2.5 2000/09/23 17:30:06 sommerfeld Exp $
+#      $NetBSD: files.i386,v 1.147.2.6 2000/11/18 23:25:51 sommerfeld Exp $
 #
 # new style config file for i386 architecture
 #
@@ -31,6 +31,9 @@
 # Speed hack; make NOPs dummies (might break on some machines)
 defopt DUMMY_NOPS
 
+# Performance counter support
+defopt PERFCTRS
+
 # X server support in console drivers
 defopt opt_xserver.h XSERVER XSERVER_DDB
 
@@ -40,8 +43,13 @@
 defopt opt_mpbios.h MPVERBOSE MPDEBUG
 
 # PCI BIOS options
-defopt opt_pcibios.h PCIBIOS PCIBIOSVERBOSE PCIBIOS_INTR_FIXUP
-       PCIINTR_DEBUG PCIBIOS_BUS_FIXUP PCIBIOS_ADDR_FIXUP
+defopt opt_pcibios.h PCIBIOS PCIBIOSVERBOSE
+       PCIBIOS_ADDR_FIXUP PCIBIOS_BUS_FIXUP
+       PCIBIOS_INTR_FIXUP PCIBIOS_INTR_FIXUP_FORCE
+       PCIBIOS_INTR_GUESS PCIBIOS_IRQS_HINT PCIINTR_DEBUG
+
+# Large page size
+defopt LARGEPAGES
 
 file   arch/i386/i386/autoconf.c
 file   arch/i386/i386/bus_machdep.c
@@ -75,6 +83,8 @@
 file   arch/i386/i386/lock_machdep.c   multiprocessor
 file    arch/i386/i386/ipifuncs.c       multiprocessor
 
+file   arch/i386/i386/pmc.c            perfctrs
+
 #
 # Machine-independent SCSI drivers
 #
@@ -97,8 +107,14 @@
 # RAIDframe
 major  {raid = 18}
 
-# Compaq arrays
-major  {ca = 19}
+# Logical storage units
+major  {lsu = 19}
+
+#
+# Machine-independent I2O drivers
+#
+
+include "dev/i2o/files.i2o"
 
 # attribute used to bring in BIOS trampoline code for real-mode probing
 # of certain devices/BIOS features
@@ -144,6 +160,7 @@
 device pchb: pcibus
 attach pchb at pci
 file   arch/i386/pci/pchb.c            pchb
+file   arch/i386/pci/pchb_rnd.c        pchb & rnd
 
 # PCI-EISA bridges
 device pceb: eisabus, isabus
@@ -355,7 +372,7 @@
 # needs to be before its isa and pci attachments.  This answer is
 # non-optimal, but I don't have a better answer right now.
 
-# PCIC pcmcia contoller
+# PCIC pcmcia controller
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
 
@@ -386,7 +403,7 @@
 # needs to be before its isa and pci attachments.  This answer is
 # non-optimal, but I don't have a better answer right now.
 
-# TCIC pcmcia contoller
+# TCIC pcmcia controller
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
 
@@ -397,7 +414,7 @@
 device tcic: pcmciabus
 file   dev/ic/tcic2.c                  tcic
 
-# TCIC pcmcia contoller
+# TCIC pcmcia controller
 attach tcic at isa with tcic_isa
 file   dev/isa/tcic2_isa.c             tcic_isa
 
@@ -410,4 +427,6 @@
 
 include "dev/usb/files.usb"
 
+include "dev/ieee1394/files.ieee1394"
+
 include "arch/i386/pnpbios/files.pnpbios"