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 Move former PS2 config to GENERIC_PS2, mo...



details:   https://anonhg.NetBSD.org/src/rev/4882a125952d
branches:  trunk
changeset: 513022:4882a125952d
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Jul 21 16:26:46 2001 +0000

description:
Move former PS2 config to GENERIC_PS2, mostly so that it fits the
installation snapshot build machinery well; also improve some comments.
Adjust INSTALL_PS2 config accordingly.

diffstat:

 sys/arch/i386/conf/GENERIC_PS2 |  221 +++++++++++++++++++++++++++++++++++++++++
 sys/arch/i386/conf/INSTALL_PS2 |    4 +-
 sys/arch/i386/conf/PS2         |  221 -----------------------------------------
 3 files changed, 223 insertions(+), 223 deletions(-)

diffs (truncated from 467 to 300 lines):

diff -r 3b3f515cc7c3 -r 4882a125952d sys/arch/i386/conf/GENERIC_PS2
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/conf/GENERIC_PS2    Sat Jul 21 16:26:46 2001 +0000
@@ -0,0 +1,221 @@
+#      $NetBSD: GENERIC_PS2,v 1.1 2001/07/21 16:26:46 jdolecek Exp $
+#
+#      GENERIC-style kernel config for IBM PS/2 with MCA bus. Note some stuff
+#      is disabled here compared to other GENERIC configs, mostly due to
+#      being not appropriate for IBM PS/2.
+#
+#      BEWARE:
+#       MCA support in NetBSD is still experimental at this
+#       stage and should be used with caution.
+#
+#       See also sys/dev/mca/TODO for list of problems and current list of
+#       projects.
+
+include "arch/i386/conf/std.i386"
+
+maxusers       16              # estimated number of users
+
+# CPU support.  At least one is REQUIRED.
+options        I386_CPU
+options        I486_CPU
+options        I586_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
+# eliminate delay no-ops in I/O; recommended on all but very old machines
+#options       DUMMY_NOPS
+
+# delay between "rebooting ..." message and hardware reset, in milliseconds
+#options       CPURESET_DELAY=2000
+
+# 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
+#      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
+
+# 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
+# values.  Note that the BIOS may *correctly* report less than 640k of base
+# memory if the extended BIOS data area is located at the top of base memory
+# (as is the case on most recent systems).
+#options       REALBASEMEM=639         # size of base memory (in KB)
+#options       REALEXTMEM=15360        # size of extended memory (in KB)
+
+# Standard system options
+
+options        UCONSOLE        # users can use TIOCCONS (for xconsole)
+options        INSECURE        # disable kernel security levels
+
+options        RTC_OFFSET=-600 # 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       SEMMNI=10       # number of semaphore identifiers
+#options       SEMMNS=60       # number of semaphores in system
+#options       SEMUME=10       # max number of undo entries per process
+#options       SEMMNU=30       # number of undo structures in system
+options        SYSVSHM         # System V-like memory sharing
+#options       SHMMAXPGS=1024  # 1024 pages is the default
+
+options        LKM             # loadable kernel modules
+
+# Diagnostic/debugging support options
+#options       DIAGNOSTIC      # expensive 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       KGDB            # remote debugger
+#options       "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
+#makeoptions   DEBUG="-g"      # compile full symbol table
+makeoptions    COPTS="-Os"     # generates smaller code than -O2, -O1
+
+# File systems
+file-system    FFS             # UFS
+#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   NTFS            # Windows/NT file system (experimental)
+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   NULLFS          # loopback file system
+#file-system   OVERLAY         # overlay file system
+#file-system   PORTAL          # portal filesystem (still experimental)
+#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       FFS_EI          # FFS Endian Independent 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.
+# Networking options
+#options       GATEWAY         # packet forwarding
+options        INET            # IP + ICMP + TCP + UDP
+options        INET6           # IPV6
+#options       IPSEC           # IP security
+#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_DEBUG     # debug for IP security
+#options       MROUTING        # IP multicast routing
+#options       NS              # XNS
+#options       NSIP            # XNS tunneling over IP
+#options       ISO,TPIP        # OSI
+#options       EON             # OSI tunneling over IP
+#options       CCITT,LLC,HDLC  # X.25
+#options       NETATALK        # AppleTalk networking protocols
+#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       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
+
+# 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  # verbose PnP BIOS messages
+#options       PNPBIOSDEBUG    # more fulsome PnP BIOS debugging messages
+#options       I2OVERBOSE      # verbose I2O driver messages
+options        MCAVERBOSE      # verbose MCA device autoconfig messages
+
+options                NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
+
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+options        WS_KERNEL_FG=WSCOL_GREEN
+
+# Kernel root file system and dump configuration.
+config         netbsd  root on ? type ?
+#config                netbsd  root on ? type nfs
+#config                netbsd  root on ed0a type ffs
+
+#
+# Device Configuration
+#
+
+mainbus0 at root
+mca0   at mainbus0
+isa0   at mainbus0
+
+#npx0  at isa? port 0xf0 irq 13        # x86 math coprocessor
+
+#pc0   at isa? port 0x60 irq 1   
+
+# wscons
+pckbc0         at isa?                 # pc keyboard controller
+options                PCKBCDEBUG
+#pcconskbd*    at pckbc?
+#pms*          at pckbc?               # PS/2 mouse for wsmouse
+#wsmouse*      at pms?
+pckbd*         at pckbc?               # PC keyboard
+wskbd*         at pckbd? console ?
+vga0           at isa?
+wsdisplay*     at vga? console ?
+options        WSDISPLAY_DEFAULTSCREENS=4
+
+com0   at isa? port 0x3f8 irq 4        # "SERIAL_!"
+lpt0   at isa? port 0x3bc irq 7        # "PARALLEL_1"
+fdc0   at isa? port 0x3f0 irq 6 drq 2  # standard PC floppy controllers
+fd*    at fdc? drive ?                 # the drives themselves
+
+# MCA serial interfaces
+com*   at mca? slot ?                  # 16x50s on comm boards
+
+# MCA network devices
+elmc*  at mca? slot ?                  # 3Com EtherLink/MC (3c523)
+ep*    at mca? slot ?                  # 3Com EtherLink III (3c529)
+we*    at mca? slot ?                  # WD/SMC Ethernet
+ate*   at mca? slot ?                  # Allied Telesis AT1720
+ne*    at mca? slot ?                  # Novell NE/2 and clones
+tr*    at mca? slot ?                  # IBM Token Ring adapter
+le*    at mca? slot ?                  # SKNET Personal/MC2+
+
+# MCA ESDI controllers & disks
+edc*   at mca? slot ?                  # IBM ESDI Disk Controllers
+ed*    at edc?
+
+# MCA SCSI controllers
+aha*   at mca? slot ?                  # Adaptec AHA-1640
+
+# SCSI bus support
+scsibus* at aha?
+
+# 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
+#ses*  at scsibus? target ? lun ?      # SCSI Enclosure Services devices
+#ss*   at scsibus? target ? lun ?      # SCSI scanners
+#uk*   at scsibus? target ? lun ?      # SCSI unknown
+
+# network pseudo-devices
+pseudo-device  bpfilter        4       # Berkeley packet filter
+pseudo-device  loop                    # network loopback
+
+# miscellaneous pseudo-devices
+pseudo-device  pty                     # pseudo-terminals
+pseudo-device  md              1       # memory disk device (ramdisk)
+# rnd works; RND_COM does not on port i386 yet.
+pseudo-device  rnd                     # /dev/random and in-kernel generator
+#options       RND_COM                 # use "com" randomness as well (BROKEN)
diff -r 3b3f515cc7c3 -r 4882a125952d sys/arch/i386/conf/INSTALL_PS2
--- a/sys/arch/i386/conf/INSTALL_PS2    Sat Jul 21 16:12:16 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL_PS2    Sat Jul 21 16:26:46 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: INSTALL_PS2,v 1.1 2001/07/21 13:16:23 jdolecek Exp $
+#      $NetBSD: INSTALL_PS2,v 1.2 2001/07/21 16:26:46 jdolecek Exp $
 #
 #      INSTALL_PS2 - PS/2 Installation kernel.
 #
 #      This kernel is derived from PS2 with MEMORY_DISK stuff added.
 #
 
-include "arch/i386/conf/PS2"
+include "arch/i386/conf/GENERIC_PS2"
 
 # Enable the hooks used for initializing the root memory-disk.
 options        MEMORY_DISK_HOOKS
diff -r 3b3f515cc7c3 -r 4882a125952d sys/arch/i386/conf/PS2
--- a/sys/arch/i386/conf/PS2    Sat Jul 21 16:12:16 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-#      $NetBSD: PS2,v 1.26 2001/07/21 16:12:16 jdolecek Exp $
-#
-#      Sample kernel config for PS/2 with MCA bus
-#
-#      WARNING: DO NOT USE UNLESS YOU ARE PREPARED TO DEAL WITH PROBLEMS.
-#
-#      BEWARE:
-#       MCA support in NetBSD is still experimental at this
-#       stage and should be used with caution.
-#
-#       See also sys/dev/mca/TODO for list of problems and current list of
-#       projects.
-
-include "arch/i386/conf/std.i386"
-
-maxusers       16              # estimated number of users
-
-# CPU support.  At least one is REQUIRED.
-options        I386_CPU
-options        I486_CPU
-options        I586_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
-# eliminate delay no-ops in I/O; recommended on all but very old machines
-#options       DUMMY_NOPS
-
-# delay between "rebooting ..." message and hardware reset, in milliseconds
-#options       CPURESET_DELAY=2000
-
-# 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
-#      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
-
-# 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
-# values.  Note that the BIOS may *correctly* report less than 640k of base
-# memory if the extended BIOS data area is located at the top of base memory
-# (as is the case on most recent systems).
-#options       REALBASEMEM=639         # size of base memory (in KB)
-#options       REALEXTMEM=15360        # size of extended memory (in KB)
-
-# Standard system options
-
-options        UCONSOLE        # users can use TIOCCONS (for xconsole)
-options        INSECURE        # disable kernel security levels
-
-options        RTC_OFFSET=-600 # hardware clock is this many mins. west of GMT



Home | Main Index | Thread Index | Old Index