Permalink
Browse files

Merge changes from the trunk

  • Loading branch information...
1 parent b8b4803 commit b8454c7f633410117cb3927735265205d99262b2 gwr committed Mar 13, 1997
@@ -1,8 +1,8 @@
-# $NetBSD: DISKLESS,v 1.17 1997/01/31 02:08:19 thorpej Exp $
+# $NetBSD: DISKLESS,v 1.17.4.1 1997/03/13 02:25:57 gwr Exp $
#
# DISKLESS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
-# Root and swap on NFS (no choice)
+# Root and swap on NFS
# Includes devices needed to run as an X-terminal
#
@@ -16,13 +16,14 @@ options HAVECACHE # Sun3/260 VAC
maxusers 4
# Standard system options
-options KTRACE # system call tracing support
+options KTRACE # system call tracing support
# Debugging options. Uncomment either this:
#options DDB
-# ... or these two: (for KGDB on another machine)
-makeoptions DEBUG="-g" # symbols for kgdb + nm
+# ... or these for KGDB (gdb remote target)
+makeoptions DEBUG="-g" # debugging symbols for gdb
options KGDB
+options KGDBDEV=0x0C01
# Filesystem options
file-system NFS # nfs client support
@@ -37,7 +38,7 @@ options FIFO # FIFOs; RECOMMENDED
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
-# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
+# XXX - Work-around for root on slow servers (insurance...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
@@ -71,11 +72,11 @@ ms0 at zsc0 channel 1 # mouse
#
# Intel Ethernet (onboard, or VME)
-ie0 at obio0 addr ? level ?
+ie0 at obio0 addr 0x0C0000 level 3
ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
# Lance Ethernet (only onboard)
-le0 at obio0 addr ? level ?
+le0 at obio0 addr 0x120000 level 3
#
# Frame buffer devices
@@ -109,5 +110,7 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
# Misc.
pseudo-device loop 1 # network loopback
+pseudo-device sl 2 # CSLIP
+pseudo-device ppp 2 # PPP
pseudo-device pty 32 # pseudo-terminals
@@ -1,4 +1,4 @@
-# $NetBSD: FOUR_TTYS,v 1.7.2.1 1997/03/12 14:04:26 is Exp $
+# $NetBSD: FOUR_TTYS,v 1.7.2.2 1997/03/13 02:26:00 gwr Exp $
#
# FOUR_TTYS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@@ -42,7 +42,7 @@ options FIFO # FIFOs; RECOMMENDED
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
-# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
+# XXX - Work-around for root on slow servers (insurance...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
@@ -54,7 +54,7 @@ options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options
-options PMAP_DEBUG
+#options PMAP_DEBUG
#options VMFAULT_TRACE
#options SYSCALL_DEBUG
#options EXEC_DEBUG
@@ -93,29 +93,27 @@ le0 at obio0 addr 0x120000 level 3
#
# Sun3 "si" SCSI controller (NCR 5380)
-# This driver has several flags which may be enabled by OR'ing
-# the values and using the "flags" directive. (PR#1929)
-# Valid flags are:
-#
-# 0x01 Use DMA (may be polled)
-# 0x02 Use DMA completion interrupts
-# 0x04 Allow disconnect/reselect
-#
-# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
-# Note: these values are quite a bit paranoid...
si0 at obio0 addr 0x140000 level 2
si0 at vmes0 addr 0xff200000 level 2 vect 0x40
si1 at vmes0 addr 0xff204000 level 2 vect 0x41
-# Xylogics 7053 controllers
-# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
-# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
-# xd* at xdc? drive ?
-
# Xylogics 450/451 controllers
# xyc0 at vmes0 addr 0xffffee40 level 2 vect 0x48
# xyc1 at vmes0 addr 0xffffee48 level 2 vect 0x49
-# xy* at xyc? drive ?
+# Just wire-down the units so bootdev match is easy.
+# xy0 at xyc0 drive 0
+# xy1 at xyc0 drive 1
+# xy2 at xyc1 drive 0
+# xy3 at xyc1 drive 1
+
+# Xylogics 7053 controllers
+# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
+# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
+# Just wire-down the units so bootdev match is easy.
+# xd0 at xdc0 drive 0
+# xd1 at xdc0 drive 1
+# xd2 at xdc1 drive 0
+# xd3 at xdc1 drive 1
# Xylogics 472 tape controllers?
@@ -154,21 +152,12 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
#
scsibus* at scsi?
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
-sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
-st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
-cd* at scsibus? target ? lun ?
-
-#ch* at scsibus? target ? lun ?
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+ch* at scsibus? target ? lun ? # SCSI changer devices
+ss* at scsibus? target ? lun ? # SCSI scanners
+uk* at scsibus? target ? lun ? # unknown SCSI devices
# Memory-disk drivers
pseudo-device md 2
@@ -179,6 +168,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
+#pseudo-device ipfilter # ip filter
pseudo-device pty 64 # pseudo-terminals
#pseudo-device vnd 4 # paging to files
View
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.35.2.1 1997/03/12 14:04:27 is Exp $
+# $NetBSD: GENERIC,v 1.35.2.2 1997/03/13 02:26:01 gwr Exp $
#
# GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@@ -42,7 +42,7 @@ options FIFO # FIFOs; RECOMMENDED
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
-# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
+# XXX - Work-around for root on slow servers (insurance...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
@@ -54,7 +54,7 @@ options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options
-options PMAP_DEBUG
+#options PMAP_DEBUG
#options VMFAULT_TRACE
#options SYSCALL_DEBUG
#options EXEC_DEBUG
@@ -88,29 +88,37 @@ le0 at obio0 addr 0x120000 level 3
#
# Sun3 "si" SCSI controller (NCR 5380)
-# This driver has several flags which may be enabled by OR'ing
-# the values and using the "flags" directive. (PR#1929)
-# Valid flags are:
+# This driver has several flags which may be enabled using
+# the "flags" directive. Valid flags are:
#
-# 0x01 Use DMA (may be polled)
-# 0x02 Use DMA completion interrupts
-# 0x04 Allow disconnect/reselect
+# 0x000ff Set (1<<target) to disable disconnect/reselect
+# 0x0ff00 Set (1<<(target+8)) to disable parity checking
+# 0x10000 Set this bit to disable DMA interrupts (poll)
+# 0x20000 Set this bit to disable DMA entirely (use PIO)
#
-# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
-# Note: these values are quite a bit paranoid...
+# For example: "flags 0x1000f" would disable DMA interrupts,
+# and disable disconnect/reselect for targets 0-3
si0 at obio0 addr 0x140000 level 2
si0 at vmes0 addr 0xff200000 level 2 vect 0x40
si1 at vmes0 addr 0xff204000 level 2 vect 0x41
-# Xylogics 7053 controllers
-# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
-# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
-# xd* at xdc? drive ?
-
# Xylogics 450/451 controllers
# xyc0 at vmes0 addr 0xffffee40 level 2 vect 0x48
# xyc1 at vmes0 addr 0xffffee48 level 2 vect 0x49
-# xy* at xyc? drive ?
+# Just wire-down the units so bootdev match is easy.
+# xy0 at xyc0 drive 0
+# xy1 at xyc0 drive 1
+# xy2 at xyc1 drive 0
+# xy3 at xyc1 drive 1
+
+# Xylogics 7053 controllers
+# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
+# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
+# Just wire-down the units so bootdev match is easy.
+# xd0 at xdc0 drive 0
+# xd1 at xdc0 drive 1
+# xd2 at xdc1 drive 0
+# xd3 at xdc1 drive 1
# Xylogics 472 tape controllers?
@@ -149,21 +157,12 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
#
scsibus* at scsi?
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
-sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
-st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
-cd* at scsibus? target ? lun ?
-
-#ch* at scsibus? target ? lun ?
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+ch* at scsibus? target ? lun ? # SCSI changer devices
+ss* at scsibus? target ? lun ? # SCSI scanners
+uk* at scsibus? target ? lun ? # unknown SCSI devices
# Memory-disk drivers
pseudo-device md 2
@@ -174,6 +173,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
+#pseudo-device ipfilter # ip filter
pseudo-device pty 64 # pseudo-terminals
#pseudo-device vnd 4 # paging to files
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_KGDB,v 1.8.2.1 1997/03/12 14:04:29 is Exp $
+# $NetBSD: GENERIC_KGDB,v 1.8.2.2 1997/03/13 02:26:03 gwr Exp $
#
# GENERIC_KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@@ -45,7 +45,7 @@ options FIFO # FIFOs; RECOMMENDED
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
-# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
+# XXX - Work-around for root on slow servers (insurance...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
@@ -57,7 +57,7 @@ options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options
-options PMAP_DEBUG
+#options PMAP_DEBUG
#options VMFAULT_TRACE
#options SYSCALL_DEBUG
#options EXEC_DEBUG
@@ -91,29 +91,27 @@ le0 at obio0 addr 0x120000 level 3
#
# Sun3 "si" SCSI controller (NCR 5380)
-# This driver has several flags which may be enabled by OR'ing
-# the values and using the "flags" directive. (PR#1929)
-# Valid flags are:
-#
-# 0x01 Use DMA (may be polled)
-# 0x02 Use DMA completion interrupts
-# 0x04 Allow disconnect/reselect
-#
-# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
-# Note: these values are quite a bit paranoid...
si0 at obio0 addr 0x140000 level 2
si0 at vmes0 addr 0xff200000 level 2 vect 0x40
si1 at vmes0 addr 0xff204000 level 2 vect 0x41
-# Xylogics 7053 controllers
-# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
-# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
-# xd* at xdc? drive ?
-
# Xylogics 450/451 controllers
# xyc0 at vmes0 addr 0xffffee40 level 2 vect 0x48
# xyc1 at vmes0 addr 0xffffee48 level 2 vect 0x49
-# xy* at xyc? drive ?
+# Just wire-down the units so bootdev match is easy.
+# xy0 at xyc0 drive 0
+# xy1 at xyc0 drive 1
+# xy2 at xyc1 drive 0
+# xy3 at xyc1 drive 1
+
+# Xylogics 7053 controllers
+# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
+# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
+# Just wire-down the units so bootdev match is easy.
+# xd0 at xdc0 drive 0
+# xd1 at xdc0 drive 1
+# xd2 at xdc1 drive 0
+# xd3 at xdc1 drive 1
# Xylogics 472 tape controllers?
@@ -152,21 +150,12 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
#
scsibus* at scsi?
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
-sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
-st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
-cd* at scsibus? target ? lun ?
-
-#ch* at scsibus? target ? lun ?
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+ch* at scsibus? target ? lun ? # SCSI changer devices
+ss* at scsibus? target ? lun ? # SCSI scanners
+uk* at scsibus? target ? lun ? # unknown SCSI devices
# Memory-disk drivers
pseudo-device md 2
@@ -177,6 +166,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
+#pseudo-device ipfilter # ip filter
pseudo-device pty 64 # pseudo-terminals
#pseudo-device vnd 4 # paging to files
Oops, something went wrong.

0 comments on commit b8454c7

Please sign in to comment.