Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/conf Massive cleanup and syncing with GENERIC
details: https://anonhg.NetBSD.org/src/rev/53b801f04645
branches: trunk
changeset: 486784:53b801f04645
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun May 28 20:10:29 2000 +0000
description:
Massive cleanup and syncing with GENERIC
diffstat:
sys/arch/i386/conf/DR-EVIL | 201 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 163 insertions(+), 38 deletions(-)
diffs (truncated from 458 to 300 lines):
diff -r 87e0f8707308 -r 53b801f04645 sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL Sun May 28 20:03:21 2000 +0000
+++ b/sys/arch/i386/conf/DR-EVIL Sun May 28 20:10:29 2000 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: DR-EVIL,v 1.14 2000/04/23 17:51:21 thorpej Exp $
+# $NetBSD: DR-EVIL,v 1.15 2000/05/28 20:10:29 thorpej Exp $
#
-# DR-EVIL -- Dell Inspiron 3500 laptop used by thorpej%netbsd.org@localhost
+# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
#
include "arch/i386/conf/std.i386"
@@ -9,11 +9,6 @@
#options IFAREF_DEBUG
-# Pull in config fragments for kernel crypto
-prefix ../crypto-us/sys
-include "conf/files.crypto-us"
-prefix
-
# CPU support. At least one is REQUIRED.
#options I386_CPU
#options I486_CPU
@@ -124,6 +119,19 @@
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
+# Pull in config fragments for kernel crypto. This is required for
+# options IPSEC etc. to work. If you want to run with IPSEC, uncomment
+# one of these, based on whether you use crypto-us or crypto-intl, and
+# adjust the prefixes as necessary.
+
+prefix ../crypto-us/sys
+cinclude "conf/files.crypto-us"
+prefix
+
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
+
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
@@ -151,11 +159,13 @@
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
#options EISAVERBOSE # verbose EISA device autoconfig messages
+options MIIVERBOSE # verbose PHY autoconfig messages
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#options PCMCIAVERBOSE # verbose PCMCIA configuration messages
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
+options PNPBIOSVERBOSE # verbos PnP BIOS messages
options NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
@@ -195,28 +205,47 @@
# Basic Bus Support
-# PnP BIOS `bus' support
-pnpbios* at mainbus?
-com* at pnpbios? index ?
-lpt* at pnpbios? index ?
-#sb* at pnpbios? index ?
-wss* at pnpbios? index ?
-#ym* at pnpbios? index ?
-pckbc* at pnpbios? index ?
-fdc* at pnpbios? index ?
+# Plug-and-Play BIOS and attached devices
+
+pnpbios* at mainbus?
+
+# mainboard audio chips
+#ess* at pnpbios0 index ? # ESS AudioDrive
+#sb* at pnpbios0 index ? # NeoMagic 256AV in sb mode
+#wss* at pnpbios0 index ? # NeoMagic 256AV in wss mode
+#ym* at pnpbios0 index ? # OPL3-SA3
-options PNPBIOSVERBOSE
+# com port
+# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
+# Interfaces" to "com*", otherwise com2 will attach at pnpbios0 and there
+# will be no com0. A side effect is pcmcia (and other) com? previously
+# starting at com3 may attach as com1 or com2.
+com* at pnpbios? index ? # serial ports
+
+# parallel port
+# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
+# "printer interfaces".
+lpt* at pnpbios? index ? # parallel ports
+
+pckbc* at pnpbios? index ? # PC keyboard/mouse controller
+fdc* at pnpbios? index ? # floppy controller
+
+# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
+#pciide* at pnpbios0 index ?
# PCI bus support
pci* at mainbus? bus ?
pci* at pchb? bus ?
pci* at ppb? bus ?
+# Configure PCI using BIOS information
options PCIBIOS # PCI BIOS support
options PCIBIOSVERBOSE # PCI BIOS verbose info
options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
+#options PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
#options PCIINTR_DEBUG # super-verbse PCI interrupt fixup
options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
+#options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
@@ -255,14 +284,14 @@
# ISA Plug-and-Play PCMCIA controllers
#pcic* at isapnp?
+# CardBus bridge support
+cbb* at pci? dev ? function ?
+cardslot* at cbb?
+
# CardBus bus support
cardbus* at cardslot?
pcmcia* at cardslot?
-# CardBus bridge support
-cbb* at pci? dev ? function ?
-cardslot* at cbb?
-
# Coprocessor Support
# Math Coprocessor support
@@ -305,6 +334,7 @@
# PCI serial interfaces
#com* at puc? port ? # 16x50s on "universal" comm boards
#cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
+#cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
# ISA Plug-and-Play serial interfaces
#com* at isapnp? # Modems and serial boards
@@ -315,6 +345,9 @@
pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
com* at pcmcom? slave ? # ...and the slave devices
+# CardBus serial interfaces
+com* at cardbus? function ? # Modems and serial cards
+
# ISA serial interfaces
#options COM_HAYESP # adds Hayes ESP serial board support
#com0 at isa? port 0x3f8 irq 4 # Standard PC serial ports
@@ -342,6 +375,12 @@
#lpt1 at isa? port 0x278
#lpt2 at isa? port 0x3bc
+# LM7[89] and compatible hardware monitors
+#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
+
+# VIA VT82C686A hardware monitor
+#viapm* at pci? dev ? function ?
+#viaenv* at viapm?
# SCSI Controllers and Devices
@@ -350,18 +389,22 @@
#adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI
#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
+#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+#siop* at pci? dev ? function ? # Symbios 53c8xx SCSI (experimental)
#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
# EISA SCSI controllers
#ahb* at eisa? slot ? # Adaptec 174[02] SCSI
#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
#bha* at eisa? slot ? # BusLogic 7xx SCSI
+#dpt* at eisa? slot ? # DPT EATA SCSI
#uha* at eisa? slot ? # UltraStor 24f SCSI
# PCMCIA SCSI controllers
aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
+esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
# ISA Plug-and-Play SCSI controllers
#aha* at isapnp? # Adaptec AHA-154[02
@@ -374,6 +417,8 @@
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
#bha1 at isa? port 0x334 irq ? drq ?
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0 at isa? port 0x170 irq ? drq ? # DPT SmartCache/SmartRAID
#nca0 at isa? port 0x360 irq 15 # Port-mapped NCR 53C80 contoller
#nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
#sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
@@ -382,6 +427,9 @@
#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
+# CardBus SCSI cards
+ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
+
# SCSI bus support
#scsibus* at adv?
#scsibus* at adw?
@@ -390,11 +438,14 @@
scsibus* at ahc?
scsibus* at aic?
#scsibus* at bha?
+#scsibus* at dpt?
+scsibus* at esp?
#scsibus* at isp?
#scsibus* at nca?
#scsibus* at ncr?
#scsibus* at pcscp?
#scsibus* at sea?
+#scsibus* at siop?
#scsibus* at uha?
#scsibus* at wds?
@@ -404,8 +455,12 @@
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
#ch* at scsibus? target ? lun ? # SCSI autochangers
#ss* at scsibus? target ? lun ? # SCSI scanners
+#ses* at scsibus? target ? lun ? # SCSI Enclosure Servcies devices
uk* at scsibus? target ? lun ? # SCSI unknown
+# RAID controllers and devices
+cac* at pci? dev ? function ? # Compaq array controller
+ca* at cac? unit ? # Compaq array disk devices
# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
@@ -483,14 +538,24 @@
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
+#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
+#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
+#rtk* at pci? dev ? function ? # Realtek 8129/8139
+#sip* at pci? dev ? function ? # SiS 900 Ethernet
+#ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
#tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
+#tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
+#options TLP_MATCH_21040
+#options TLP_MATCH_21041
+#options TLP_MATCH_21140
+#options TLP_MATCH_21142
#vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
-#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
# EISA network interfaces
#ep* at eisa? slot ? # 3Com 3c579 Ethernet
#fea* at eisa? slot ? # DEC DEFEA FDDI
+#tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
@@ -498,12 +563,15 @@
#tr* at isapnp? # IBM/3COM TROPIC Token-Ring
# PCMCIA network interfaces
+#awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
+#cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
#mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
+ray* at pcmcia? function ? # Raytheon RayLink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-ray* at pcmcia? function ? # Raytheon RayLink 802.11
-xe* at pcmcia? function ? # Xircom CreditCard Ethernet
+#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+xe* at pcmcia? function ? # Xircom PCMCIA cards
mhzc* at pcmcia? function ? # Megaherz combo cards
com* at mhzc?
@@ -526,6 +594,7 @@
#le* at depca?
#nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
#le* at nele?
+#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
#ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
@@ -541,17 +610,17 @@
ex* at cardbus? dev ? function ? # 3Com 3C575TX
tlp* at cardbus? dev ? function ? # DECchip 21x4x and clones
fxp* at cardbus? dev ? function ? # Intel i8255x
-#rtk* at cardbus? dev ? function ? # Realtek 8129/8139
-
-# CardBus SCSI cards
-ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
+rtk* at cardbus? dev ? function ? # Realtek 8129/8139
# MII/PHY support
+#dmphy* at mii? phy ? # Davicom DM9101 PHYs
Home |
Main Index |
Thread Index |
Old Index