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 sync to the currently installed kernel



details:   https://anonhg.NetBSD.org/src/rev/f4b164d0f128
branches:  trunk
changeset: 471951:f4b164d0f128
user:      explorer <explorer%NetBSD.org@localhost>
date:      Fri Apr 16 01:09:25 1999 +0000

description:
sync to the currently installed kernel

diffstat:

 sys/arch/i386/conf/NBFTP |  183 ++++++++++++++++++++++++++--------------------
 1 files changed, 102 insertions(+), 81 deletions(-)

diffs (truncated from 429 to 300 lines):

diff -r 25750b874a37 -r f4b164d0f128 sys/arch/i386/conf/NBFTP
--- a/sys/arch/i386/conf/NBFTP  Fri Apr 16 00:41:58 1999 +0000
+++ b/sys/arch/i386/conf/NBFTP  Fri Apr 16 01:09:25 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NBFTP,v 1.10 1999/03/27 07:04:37 explorer Exp $
+#      $NetBSD: NBFTP,v 1.11 1999/04/16 01:09:25 explorer Exp $
 #      From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
 #
 #      NBFTP -- ftp/sup.netbsd.org server machine
@@ -12,12 +12,12 @@
 #options       I386_CPU
 #options       I486_CPU
 options        I586_CPU
-#options       I686_CPU
+options        I686_CPU
 
 # CPU-related options.
 #options       MATH_EMULATE    # floating point emulation
 #options       VM86            # virtual 8086 emulation
-#options       USER_LDT        # user-settable LDT; used by WINE
+options        USER_LDT        # user-settable LDT; used by WINE
 # eliminate delay no-ops in I/O; recommended on all but very old machines
 options        DUMMY_NOPS
 
@@ -30,10 +30,10 @@
 
 # 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=9600
 #      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
+options        CONS_OVERRIDE   # Always use above! independent of boot info
 
 # The following options override the memory sizes passed in from the boot
 # block.  Use them *only* if the boot block is unable to determine the correct
@@ -48,17 +48,17 @@
 #options       UCONSOLE        # users can use TIOCCONS (for xconsole)
 #options       INSECURE        # disable kernel security levels
 
-options        RTC_OFFSET=480  # hardware clock is this many mins. west of GMT
-#options       NTP             # NTP phase/frequency locked loop
+options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
+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        SYSVMSG         # System V-like message queues
+options        SYSVSEM         # System V-like semaphores
+options        SYSVSHM         # System V-like memory sharing
 #options       SHMMAXPGS=1024  # 1024 pages is the default
 
-#options       LKM             # loadable kernel modules
+options        LKM             # loadable kernel modules
 
 # Diagnostic/debugging support options
 options        DIAGNOSTIC      # cheap kernel consistency checks
@@ -71,11 +71,11 @@
 #makeoptions   DEBUG="-g"      # compile full symbol table
 
 # Compatibility options
-options        COMPAT_NOMID    # compatibility with 386BSD, BSDI, NetBSD 0.8,
+#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_12       # NetBSD 1.2,
 options        COMPAT_13       # NetBSD 1.3,
 options        COMPAT_43       # and 4.3BSD
 options        COMPAT_386BSD_MBRPART # recognize old partition ID
@@ -93,22 +93,22 @@
 #file-system   EXT2FS          # second extended file system (linux)
 #file-system   LFS             # log-structured file system
 file-system    MFS             # memory file system
-#file-system   NFS             # Network File System client
+file-system    NFS             # Network File System client
 #file-system   CD9660          # ISO 9660 + Rock Ridge file system
 #file-system   MSDOSFS         # MS-DOS file system
 #file-system   FDESC           # /dev/fd
-#file-system   KERNFS          # /kern
+file-system    KERNFS          # /kern
 #file-system   NULLFS          # loopback file system
 #file-system   PORTAL          # portal filesystem (still experimental)
-#file-system   PROCFS          # /proc
+file-system    PROCFS          # /proc
 #file-system   UMAPFS          # NULLFS + uid and gid remapping
 #file-system   UNION           # union file system
 #file-system   CODA            # Coda File System; also needs vcoda (below)
 
 # File system options
-#options       QUOTA           # UFS quotas
+options        QUOTA           # UFS quotas
 #options       FFS_EI          # FFS Endian Independant support
-#options       NFSSERVER       # Network File System server
+options        NFSSERVER       # Network File System server
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
 
@@ -125,28 +125,40 @@
 #options       PPP_BSDCOMP     # BSD-Compress compression support for PPP
 #options       PPP_DEFLATE     # Deflate compression support for PPP
 #options       PPP_FILTER      # Active filter support for PPP (requires bpf)
-#options       PFIL_HOOKS      # pfil(9) packet filter hooks
-#options       IPFILTER_LOG    # ipmon(8) log support
+options        PFIL_HOOKS      # pfil(9) packet filter hooks
+options        IPFILTER_LOG    # ipmon(8) log support
 
 # Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
 #options       TCP_COMPAT_42
 
-options         NMBCLUSTERS=2048
-options         BUFPAGES=2048
+options        NMBCLUSTERS=2048
+options        BUFPAGES=2048
 
 # 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        EISAVERBOSE     # verbose EISA device autoconfig messages
 options        PCIVERBOSE      # verbose PCI device autoconfig messages
 #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)"
 
 # 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
 
 #
@@ -163,13 +175,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
 
@@ -193,7 +205,7 @@
 #pcic0 at pci? dev? function ?
 
 # ISA Plug-and-Play bus support
-#isapnp0       at isa?
+isapnp0        at isa?
 
 # ISA Plug-and-Play PCMCIA controllers
 #pcic* at isapnp?
@@ -222,12 +234,12 @@
 # "opms" should not be enabled together with "pms" or "pmsi"
 #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?
+opms*          at pckbc?               # backwards compatible PS/2 mouse
+vga0           at isa?
 vga*           at pci?
-#pcdisplay0    at isa?                 # CGA, MDA, EGA, HGA
+pcdisplay0     at isa?                 # CGA, MDA, EGA, HGA
 wsdisplay*     at vga? console ?
-#wsdisplay*    at pcdisplay? console ?
+wsdisplay*     at pcdisplay? console ?
 wskbd* at pckbd? console ?
 #wsmouse*      at pms?
 #wsmouse*      at pmsi?
@@ -242,7 +254,7 @@
 #cy*   at pci? dev ? function ?        # Cyclades Cyclom-Y serial boards
 
 # ISA Plug-and-Play serial interfaces
-#com*  at isapnp?                      # Modems and serial boards
+com*   at isapnp?                      # Modems and serial boards
 
 # PCMCIA serial interfaces
 #com*  at pcmcia? function ?           # Modems and serial cards
@@ -254,7 +266,7 @@
 #options       COM_HAYESP              # adds Hayes ESP serial board support
 com0   at isa? port 0x3f8 irq 4        # Standard PC serial ports
 com1   at isa? port 0x2f8 irq 3
-#com2  at isa? port 0x3e8 irq 5
+com2   at isa? port 0x3e8 irq 5
 #com3  at isa? port 0x2e8 irq 9
 #ast0  at isa? port 0x1a0 irq 5        # AST 4-port serial cards
 #com*  at ast? slave ?
@@ -274,8 +286,8 @@
 
 # ISA parallel printer interfaces
 lpt0   at isa? port 0x378 irq 7        # standard PC parallel ports
-#lpt1  at isa? port 0x278
-#lpt2  at isa? port 0x3bc
+lpt1   at isa? port 0x278
+lpt2   at isa? port 0x3bc
 
 
 # SCSI Controllers and Devices
@@ -284,9 +296,9 @@
 #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
-#bha*  at pci? dev ? function ?        # BusLogic 9xx SCSI
+bha*   at pci? dev ? function ?        # BusLogic 9xx SCSI
 #isp*  at pci? dev ? function ?        # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#ncr*  at pci? dev ? function ?        # NCR 53c8xx SCSI
+ncr*   at pci? dev ? function ?        # NCR 53c8xx SCSI
 #pcscp*        at pci? dev ? function ?        # AMD 53c974 PCscsi-PCI SCSI
 
 # EISA SCSI controllers
@@ -324,10 +336,10 @@
 #scsibus* at ahb?
 scsibus* at ahc?
 #scsibus* at aic?
-#scsibus* at bha?
+scsibus* at bha?
 #scsibus* at isp?
 #scsibus* at nca?
-#scsibus* at ncr?
+scsibus* at ncr?
 #scsibus* at pcscp?
 #scsibus* at sea?
 #scsibus* at uha?
@@ -336,14 +348,14 @@
 # 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
-#ss*   at scsibus? target ? lun ?      # SCSI scanners
-#uk*   at scsibus? target ? lun ?      # SCSI unknown
+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 suppored 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.
@@ -356,8 +368,8 @@
 #wdc*  at pcmcia? function ?
 
 # ISA ST506, ESDI, and IDE controllers
-#wdc0  at isa? port 0x1f0 irq 14
-#wdc1  at isa? port 0x170 irq 15
+wdc0   at isa? port 0x1f0 irq 14
+wdc1   at isa? port 0x170 irq 15
 
 # IDE drives
 # Flags are used only with controllers that support DMA operations
@@ -370,18 +382,18 @@
 # 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 wdc? channel ? drive ? flags 0x0000
 wd*    at pciide? channel ? drive ? flags 0x0000
 
 # ATAPI bus support
-#atapibus* at wdc? channel ?
+atapibus* at wdc? channel ?
 atapibus* at pciide? channel ?
 
 # ATAPI devices
 # flags have the same meaning as for IDE drives.
-#cd*   at atapibus? drive ? flags 0x0000       # ATAPI CD-ROM drives
-#sd*   at atapibus? drive ? flags 0x0000       # ATAPI disk drives
-#uk*   at atapibus? drive ? flags 0x0000       # ATAPI unknown
+cd*    at atapibus? drive ? flags 0x0000       # ATAPI CD-ROM drives
+sd*    at atapibus? drive ? flags 0x0000       # ATAPI disk drives



Home | Main Index | Thread Index | Old Index