[src/netbsd-1-5]: src/sys/arch/i386/conf Pullup rev 1.4, approved by jhawk:

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

details:   https://anonhg.NetBSD.org/src/rev/d4e80bc66924
branches:  netbsd-1-5
changeset: 488590:d4e80bc66924
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Wed Jul 19 18:41:05 2000 +0000

description:
Pullup rev 1.4, approved by jhawk:
  Pullover rev 1.320 - rev 1.358 of GENERIC to IOPENER, and merge conflicts.
  Add GENERIC rev in "from:" line to aid in future merging.
  Major highlights include SOFTDEP, and, err, 4 blank lines.

diffstat:

 sys/arch/i386/conf/IOPENER |  24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (119 lines):

diff -r ba8dd989b6d5 -r d4e80bc66924 sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER        Wed Jul 19 18:38:21 2000 +0000
+++ b/sys/arch/i386/conf/IOPENER        Wed Jul 19 18:41:05 2000 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: IOPENER,v 1.3 2000/06/14 22:02:28 veego Exp $
+#      $NetBSD: IOPENER,v 1.3.2.1 2000/07/19 18:41:05 jhawk Exp $
 #
 #      IOPENER -- GENERIC-like kernel for the Netpliance i-opener
+#      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "IOPENER-$Revision: 1.3 $"
+#ident                 "IOPENER-$Revision: 1.3.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -20,10 +21,6 @@
 # delay between "rebooting ..." message and hardware reset, in milliseconds
 #options       CPURESET_DELAY=2000
 
-# Misc. i386-specific options
-options        XSERVER         # X server support in console drivers
-#options       XSERVER_DDB     # PF12 gets you into DDB when X is running
-
 # This option allows you to force a serial console at the specified
 # I/O address.   see console(4) for details.
 #options       "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
@@ -98,7 +95,7 @@
 # File system options
 #options       QUOTA           # UFS quotas
 #options       FFS_EI          # FFS Endian Independent support
-#options       SOFTDEP         # FFS soft updates support.
+options        SOFTDEP         # FFS soft updates support.
 #options       NFSSERVER       # Network File System server
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
@@ -107,6 +104,7 @@
 #options       GATEWAY         # packet forwarding
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPV6
+options        PULLDOWN_TEST   # use m_pulldown for IPv4/v6 processing
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
 #options       IPSEC_DEBUG     # debug for IP security
@@ -128,12 +126,13 @@
 
 # These options enable verbose messages for several subsystems.
 # Warning, these may compile large string tables into the kernel!
+options        MIIVERBOSE      # verbose PHY autoconfig messages
 options        PCIVERBOSE      # verbose PCI device autoconfig messages
 #options       PCI_CONFIG_DUMP # verbosely dump PCI config space
 #options       SCSIVERBOSE     # human readable SCSI error messages
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
-
+#options       PNPBIOSDEBUG    # more fullsome Pnp BIOS debugging messages
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 
 #
@@ -178,7 +177,7 @@
 #options       APM_NO_IDLE             # Don't call BIOS CPU idle function
 #options       APM_V10_ONLY            # Use only the APM 1.0 calls
 #options       APM_NO_POWEROFF         # Don't power off on halt(8)
-#options       APM_POWER_PRINT         # Don't print stats on the console
+#options       APM_POWER_PRINT         # Print stats on the console
 #options       APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
 
 
@@ -193,8 +192,10 @@
 #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-verbose 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
@@ -243,11 +244,13 @@
 com0   at isa? port 0x3f8 irq 4        # Standard PC serial ports
 com1   at isa? port 0x2f8 irq 3
 
+
 # Parallel Printer Interfaces
 
 # ISA parallel printer interfaces
 lpt0   at isa? port 0x378 irq 7        # standard PC parallel ports
 
+
 # IDE and related devices
 # PCI IDE controllers - see pciide(4) for supported hardware.
 # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
@@ -284,6 +287,7 @@
 tqphy* at mii? phy ?                   # TDK Semiconductor PHYs
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
+
 # USB Controller and Devices
 
 # PCI USB controllers
@@ -334,6 +338,7 @@
 ugen*  at uhub? port ?
 
 
+
 # Audio Devices
 
 # ISA Plug-and-Play audio devices
@@ -381,6 +386,7 @@
 #pseudo-device ipip            2       # IP Encapsulation within IP (RFC 2003)
 #pseudo-device gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
+#pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device  pty             64      # pseudo-terminals