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 Update to the current state of the world.



details:   https://anonhg.NetBSD.org/src/rev/4cb4bcefbc2e
branches:  trunk
changeset: 503676:4cb4bcefbc2e
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sun Feb 11 10:40:51 2001 +0000

description:
Update to the current state of the world.

diffstat:

 sys/arch/i386/conf/HOMEWORLD |  111 +++++++++++++++++++--------------
 sys/arch/i386/conf/MINBAR    |   19 +++--
 sys/arch/i386/conf/NBFTP     |  140 ++++++++++++++++++++----------------------
 3 files changed, 141 insertions(+), 129 deletions(-)

diffs (truncated from 748 to 300 lines):

diff -r 06e64f280307 -r 4cb4bcefbc2e sys/arch/i386/conf/HOMEWORLD
--- a/sys/arch/i386/conf/HOMEWORLD      Sun Feb 11 09:55:09 2001 +0000
+++ b/sys/arch/i386/conf/HOMEWORLD      Sun Feb 11 10:40:51 2001 +0000
@@ -1,18 +1,18 @@
-#      $NetBSD: HOMEWORLD,v 1.51 2000/09/24 15:59:33 jdolecek Exp $
+#      $NetBSD: HOMEWORLD,v 1.52 2001/02/11 10:40:51 mycroft Exp $
 #      From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
 #
-#      HOMEWORLD - Mail, CVS, and GNATS server
+#      HOMEWORLD - TNF mail/gnats
 #
 
 include "arch/i386/conf/std.i386"
 
-maxusers       32              # estimated number of users
+maxusers       64              # estimated number of users
 
 # CPU support.  At least one is REQUIRED.
 #options       I386_CPU
-options        I486_CPU
+#options       I486_CPU
 #options       I586_CPU
-#options       I686_CPU
+options        I686_CPU
 
 # CPU-related options.
 #options       MATH_EMULATE    # floating point emulation
@@ -30,7 +30,7 @@
 
 # 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
+#options       "CONSDEVNAME=\"com\"",CONADDR=0x3f8,CONSPEED=57600
 #      you don't want the option below ON iff you are using the
 #      serial console option of the new boot strap code.
 #options       CONS_OVERRIDE   # Always use above! independent of boot info
@@ -49,32 +49,35 @@
 #options       INSECURE        # disable kernel security levels
 
 options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-#options       NTP             # NTP phase/frequency locked loop
+options        NTP             # NTP phase/frequency locked loop
 
 options        KTRACE          # system call tracing via ktrace(1)
 
 #options       SYSVMSG         # System V-like message queues
-#options       SYSVSEM         # System V-like semaphores
-#options       SYSVSHM         # System V-like memory sharing
+options        SYSVSEM         # System V-like semaphores
+options        SYSVSHM         # System V-like memory sharing
 #options       SHMMAXPGS=1024  # 1024 pages is the default
 
+options        NMBCLUSTERS=2048
+options        BUFCACHE=10
+
 #options       LKM             # loadable kernel modules
 
 # Diagnostic/debugging support options
 options        DIAGNOSTIC      # cheap kernel consistency checks
 #options       DEBUG           # expensive debugging checks/support
 #options       KMEMSTATS       # kernel memory statistics (vmstat -m)
-#options       DDB             # in-kernel debugger
-#options       DDB_HISTORY_SIZE=512    # enable history editing in DDB
+options        DDB             # in-kernel debugger
+options        DDB_HISTORY_SIZE=512    # enable history editing in DDB
 #options       KGDB            # remote debugger
 #options       "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
 #makeoptions   DEBUG="-g"      # compile full symbol table
 
 # Compatibility options
-options        COMPAT_NOMID    # compatibility with 386BSD, BSDI, NetBSD 0.8,
-options        COMPAT_09       # NetBSD 0.9,
-options        COMPAT_10       # NetBSD 1.0,
-options        COMPAT_11       # NetBSD 1.1,
+#options       COMPAT_NOMID    # compatibility with 386BSD, BSDI, NetBSD 0.8,
+#options       COMPAT_09       # NetBSD 0.9,
+#options       COMPAT_10       # NetBSD 1.0,
+#options       COMPAT_11       # NetBSD 1.1,
 options        COMPAT_12       # NetBSD 1.2,
 options        COMPAT_13       # NetBSD 1.3,
 options        COMPAT_14       # NetBSD 1.4,
@@ -92,9 +95,9 @@
 #file-system   LFS             # log-structured file system
 file-system    MFS             # memory file system
 #file-system   NFS             # Network File System client
-file-system    CD9660          # ISO 9660 + Rock Ridge file system
+#file-system   CD9660          # ISO 9660 + Rock Ridge file system
 #file-system   MSDOSFS         # MS-DOS file system
-#file-system   FDESC           # /dev/fd
+file-system    FDESC           # /dev/fd
 #file-system   KERNFS          # /kern
 #file-system   NULLFS          # loopback file system
 #file-system   PORTAL          # portal filesystem (still experimental)
@@ -113,6 +116,7 @@
 # Networking options
 #options       GATEWAY         # packet forwarding
 options        INET            # IP + ICMP + TCP + UDP
+options        INET6           # IPV6
 #options       MROUTING        # IP multicast routing
 #options       NS              # XNS
 #options       NSIP            # XNS tunneling over IP
@@ -136,13 +140,27 @@
 #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        USBVERBOSE      # verbose USB device autoconfig messages
+
+options        NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
 
-#options       NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
+# wscons options
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+# different kernel output - see dev/wscons/wsdisplayvar.h
+options        WS_KERNEL_FG=WSCOL_GREEN
+options        WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
+options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
+options        WSDISPLAY_COMPAT_USL            # VT handling
+options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+# use a large software cursor that doesn't blink
+#options       PCDISPLAY_SOFTCURSOR
 
 # Kernel root file system and dump configuration.
-#config                netbsd  root on ? type ?
-config         netbsd  root on sd0a type ffs
+config         netbsd  root on ? type ?
+#config                netbsd  root on sd0a type ffs
 #config                netbsd  root on ? type nfs
 
 #
@@ -159,13 +177,13 @@
 # PCI bus support
 pci*   at mainbus? bus ?
 pci*   at pchb? bus ?
-#pci*  at ppb? bus ?
+pci*   at ppb? bus ?
 
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
 #pceb* at pci? dev ? function ?        # PCI-EISA bridges
 pcib*  at pci? dev ? function ?        # PCI-ISA bridges
-#ppb*  at pci? dev ? function ?        # PCI-PCI bridges
+ppb*   at pci? dev ? function ?        # PCI-PCI bridges
 # XXX 'puc's aren't really bridges, but there's no better place for them here
 #puc*  at pci? dev ? function ?        # PCI "universal" comm. cards
 
@@ -174,7 +192,7 @@
 #eisa* at pceb?
 
 # ISA bus support
-isa*   at mainbus?
+#isa*  at mainbus?
 #isa*  at pceb?
 isa*   at pcib?
 
@@ -202,7 +220,7 @@
 
 # Console Devices
 
-# ISA console
+# ISA console.  You can only configure one of these!
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
 
 # Keyboard layout configuration for pccons
@@ -218,8 +236,8 @@
 #pms*          at pckbc?               # PS/2 mouse for wsmouse
 #pmsi*         at pckbc?       # PS/2 "Intelli"mouse for wsmouse
 #opms*         at pckbc?               # backwards compatible PS/2 mouse
-vga0           at isa?
-#vga*          at pci?
+#vga0          at isa?
+vga*           at pci?
 #pcdisplay0    at isa?                 # CGA, MDA, EGA, HGA
 wsdisplay*     at vga? console ?
 #wsdisplay*    at pcdisplay? console ?
@@ -233,7 +251,7 @@
 # Serial Devices
 
 # PCI serial interfaces
-#com*  at puc? port ?                  # 16x50s on "universal" comm boards
+#com*  at puc? port ?                  # 16x450s on "universal" comm boards
 #cy*   at pci? dev ? function ?        # Cyclades Cyclom-Y serial boards
 
 # ISA Plug-and-Play serial interfaces
@@ -278,7 +296,7 @@
 # PCI SCSI controllers
 #adv*  at pci? dev ? function ?        # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 #adw*  at pci? dev ? function ?        # AdvanSys 9xxUW SCSI
-ahc*   at pci? dev ? function ?        # Adaptec [23]94x, aic78x0 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
@@ -319,7 +337,7 @@
 #scsibus* at adw?
 #scsibus* at aha?
 #scsibus* at ahb?
-scsibus* at ahc?
+#scsibus* at ahc?
 #scsibus* at aic?
 #scsibus* at bha?
 #scsibus* at dpt?
@@ -332,20 +350,20 @@
 #scsibus* at wds?
 
 # SCSI devices
-sd*    at scsibus? target ? lun ?      # SCSI disk drives
-st*    at scsibus? target ? lun ?      # SCSI tape drives
-cd*    at scsibus? target ? lun ?      # SCSI CD-ROM drives
-ch*    at scsibus? target ? lun ?      # SCSI autochangers
+#sd*   at scsibus? target ? lun ?      # SCSI disk drives
+#st*   at scsibus? target ? lun ?      # SCSI tape drives
+#cd*   at scsibus? target ? lun ?      # SCSI CD-ROM drives
+#ch*   at scsibus? target ? lun ?      # SCSI autochangers
 #ss*   at scsibus? target ? lun ?      # SCSI scanners
 #uk*   at scsibus? target ? lun ?      # SCSI unknown
 
 
 # IDE and related devices
-# PCI IDE controllers (CMD tech's PCI0640, Intel's PIIx, ...).
+# 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
 # how to set up DMA modes for this chip. This may work, or may cause
 # a machine hang with some controllers.
-#pciide* at pci ? dev ? function ? flags 0x0000
+pciide* at pci ? dev ? function ? flags 0x0000
 
 # ISA Plug-and-Play IDE controllers
 #wdc*  at isapnp? 
@@ -354,7 +372,7 @@
 #wdc*  at pcmcia? function ?
 
 # ISA ST506, ESDI, and IDE controllers
-wdc0   at isa? port 0x1f0 irq 14
+#wdc0  at isa? port 0x1f0 irq 14
 #wdc1  at isa? port 0x170 irq 15
 
 # IDE drives
@@ -368,12 +386,12 @@
 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
 # (0xc=1100, 0xa=1010, 0xf=1111)
 # 0x0000 means "use whatever the drive claims to support".
-wd*    at wdc? channel ? drive ? flags 0x0000
-#wd*   at pciide? channel ? drive ? flags 0x0000
+#wd*   at wdc? channel ? drive ? flags 0x0000
+wd*    at pciide? channel ? drive ? flags 0x0000
 
 # ATAPI bus support
-atapibus* at wdc? channel ?
-#atapibus* at pciide? channel ?
+#atapibus* at wdc? channel ?
+atapibus* at pciide? channel ?
 
 # ATAPI devices
 # flags have the same meaning as for IDE drives.
@@ -411,7 +429,7 @@
 #epic* at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 #esh*  at pci? dev ? function ?        # Essential HIPPI card
 #fpa*  at pci? dev ? function ?        # DEC DEFPA FDDI
-#fxp*  at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
+fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 #le*   at pci? dev ? function ?        # PCnet-PCI Ethernet
 #ne*   at pci? dev ? function ?        # NE2000-compatible Ethernet
 #tl*   at pci? dev ? function ?        # ThunderLAN-based Ethernet
@@ -449,7 +467,7 @@
 #le*   at nele?
 #bicc0 at isa? port 0x320 irq 10 drq 7         # BICC IsoLan
 #le*   at bicc?
-ne0    at isa? port 0x300 irq 9                # NE[12]000 ethernet cards
+#ne0   at isa? port 0x280 irq 9                # NE[12]000 ethernet cards
 #ne1   at isa? port 0x300 irq 10
 #sm0   at isa? port 0x300 irq 10               # SMC91C9x Ethernet
 #we0   at isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC Ethernet
@@ -458,7 +476,7 @@
 # MII/PHY support
 #exphy*        at mii? phy ?                   # 3Com internal PHYs
 #icsphy*       at mii? phy ?                   # Integrated Circuit Systems ICS1890
-#inphy*        at mii? phy ?                   # Intel 82555 PHYs
+inphy* at mii? phy ?                   # Intel 82555 PHYs
 #lxtphy*       at mii? phy ?                   # Level One LXT-970 PHYs
 #nsphy*        at mii? phy ?                   # NS83840 PHYs
 #qsphy*        at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
@@ -595,19 +613,20 @@
 
 # network pseudo-devices
 pseudo-device  bpfilter        8       # Berkeley packet filter
-#pseudo-device ipfilter                # IP filter (firewall) and NAT
+pseudo-device  ipfilter                # IP filter (firewall) and NAT
 pseudo-device  loop                    # network loopback
 #pseudo-device ppp             2       # Point-to-Point Protocol
 #pseudo-device sl              2       # Serial Line IP
 #pseudo-device strip           2       # Starmode Radio IP (Metricom)
 #pseudo-device tun             2       # network tunneling over tty
 #pseudo-device gre             2       # generic L3 over IP tunnel
+pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 
 # miscellaneous pseudo-devices



Home | Main Index | Thread Index | Old Index