diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2000-05-26 00:44:23 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2000-05-26 00:44:23 +0000 |
commit | 10be8c4d45bce2fa07349452315cc5bfb9752ba3 (patch) | |
tree | c0101c253b08087701ec7f54fdb0e22c91051b3b /sys/arch/sun3 | |
parent | 03131b794ef6e1d27a265332279d4d2ca15193e5 (diff) |
Use ../../../conf/GENERIC for standard set of options; general cleanup
Diffstat (limited to 'sys/arch/sun3')
-rw-r--r-- | sys/arch/sun3/conf/COYOTE | 118 | ||||
-rw-r--r-- | sys/arch/sun3/conf/DISKLESS | 30 | ||||
-rw-r--r-- | sys/arch/sun3/conf/FOUR_TTYS | 193 | ||||
-rw-r--r-- | sys/arch/sun3/conf/GENERIC | 101 | ||||
-rw-r--r-- | sys/arch/sun3/conf/GENERIC_KGDB | 185 | ||||
-rw-r--r-- | sys/arch/sun3/conf/RAMDISK | 31 | ||||
-rw-r--r-- | sys/arch/sun3/conf/SMD_TEST | 114 | ||||
-rw-r--r-- | sys/arch/sun3/conf/std.sun3 | 41 |
8 files changed, 342 insertions, 471 deletions
diff --git a/sys/arch/sun3/conf/COYOTE b/sys/arch/sun3/conf/COYOTE index 7c7db910362..244750a07b7 100644 --- a/sys/arch/sun3/conf/COYOTE +++ b/sys/arch/sun3/conf/COYOTE @@ -1,70 +1,39 @@ # -# $OpenBSD: COYOTE,v 1.10 1997/09/26 16:47:42 kstailey Exp $ +# $OpenBSD: COYOTE,v 1.11 2000/05/26 00:44:20 miod Exp $ # # # Sun3 3/60M # -include "arch/sun3/conf/std.sun3" +# machine architecture; required by config(8) +machine sun3 m68k -# Machines to be supported by this kernel -#option FPU_EMULATE -#option HAVECACHE # Sun3/260 VAC +include "../../../conf/GENERIC" -# Needs to be set per system. i.e change these as you see fit -maxusers 4 +config bsd swap generic -# Standard system options -option KTRACE # system call tracing support +# The root node: +mainbus0 at root -# Debugging options. Uncomment either this: -option DDB -# ... or these two: (for KGDB on another machine) -#makeoptions DEBUG="-g" # symbols for kgdb + nm -#option KGDB +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? -# Filesystem options -option NFSCLIENT # nfs client support -# -option FFS # fast filesystem -option MFS # memory-based filesystem -#option FDESC # /dev/fd/* (depreciated) -option FIFO # FIFOs; RECOMMENDED -option KERNFS # /kern -#option NULLFS # loopback file system -option PROCFS # /proc -#option UNION # union file system (merged directories) -#option PORTAL # dynamically created filesystem objects - -# Networking options -option INET # IP prototol stack support -option GATEWAY # IP packet forwarding -option IPFILTER # IP packet filter for security and NAT -option IPFILTER_LOG # use /dev/ipl to log IPF -# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) -#option NFS_BOOT_RWSIZE=1024 - -# Compatability options -#option COMPAT_SUNOS # can run SunOS 4.1.1 executables -#option COMPAT_09 # NetBSD 0.9, -option COMPAT_10 # NetBSD 1.0, -option COMPAT_11 # NetBSD 1.1, -option COMPAT_43 # and 4.3BSD -#option TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD -option SYSVSHM # SysV shared mem compatibility -#option SYSVMSG # SysV message queue compatibility -#option SYSVSEM # SysV semaphore compatibility - -# Sun3-specific debugging options -#option PMAP_DEBUG -#option VMFAULT_TRACE -#option SYSCALL_DEBUG -#option EXEC_DEBUG -option DIAGNOSTIC +# Devices that should be present in any Sun3 kernel. -#config bsd root on nfs swap on nfs -config bsd root on sd0 swap on sd0 dumps on sd0 +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 # # Serial ports @@ -81,6 +50,13 @@ ms0 at zsc0 channel 1 # mouse # Lance Ethernet (only onboard) le0 at obio0 addr 0x120000 level 3 +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG + +# +# Disk and tape devices +# # Sun3 "si" SCSI controller (NCR 5380) # This driver has several flags which may be enabled by OR'ing @@ -93,7 +69,15 @@ le0 at obio0 addr 0x120000 level 3 # # 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 flags 0 +si0 at obio0 addr 0x140000 level 2 flags 0x07 + +# Frame buffer devices +# + +# The default bwtwo address depends on the machine: +# 3/50: obmem 0x100000 +# else: obmem 0xff000000 +bwtwo0 at obmem0 addr ? # # SCSI infrastructure @@ -103,18 +87,16 @@ scsibus* at scsi? # Sun incompatible scsi device mappings sd* at scsibus? target ? lun ? -# -# Frame buffer devices -# +# Compatibility options +option COMPAT_SUNOS # can run SunOS 4.1.1 executables -bwtwo0 at obmem0 addr ? - -# Misc. -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 2 # packet filter -#pseudo-device sl 2 # CSLIP -pseudo-device ppp 1 # PPP -#pseudo-device tun 2 # network tunneling over tty +# Sun3-specific debugging options +#option PMAP_DEBUG +#option VMFAULT_TRACE +#option SYSCALL_DEBUG +#option EXEC_DEBUG +#option SCSIDEBUG -pseudo-device pty 32 # pseudo-terminals -#pseudo-device vnd 4 # paging to files +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS index db5c61e21ca..0ac3f94f997 100644 --- a/sys/arch/sun3/conf/DISKLESS +++ b/sys/arch/sun3/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.15 2000/05/26 00:07:26 miod Exp $ +# $OpenBSD: DISKLESS,v 1.16 2000/05/26 00:44:21 miod Exp $ # $NetBSD: DISKLESS,v 1.12.4.1 1996/08/19 23:35:03 gwr Exp $ # @@ -7,7 +7,33 @@ # Includes devices needed to run as an X-terminal # -include "arch/sun3/conf/std.sun3" +machine sun3 m68k + +# The root node: +mainbus0 at root + +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? + +# Devices that should be present in any Sun3 kernel. + +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 + +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG # Machines to be supported by this kernel option FPU_EMULATE diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS index f8b58c95d67..9e41f706d7f 100644 --- a/sys/arch/sun3/conf/FOUR_TTYS +++ b/sys/arch/sun3/conf/FOUR_TTYS @@ -1,4 +1,4 @@ -# $OpenBSD: FOUR_TTYS,v 1.10 2000/05/26 00:07:26 miod Exp $ +# $OpenBSD: FOUR_TTYS,v 1.11 2000/05/26 00:44:21 miod Exp $ # $NetBSD: FOUR_TTYS,v 1.1.4.1 1996/08/19 23:35:05 gwr Exp $ # @@ -6,62 +6,41 @@ # like GENERIC but both zs chips are used as ttys # -include "arch/sun3/conf/std.sun3" +# machine architecture; required by config(8) +machine sun3 m68k -# Machines to be supported by this kernel -options GENERIC -options FPU_EMULATE -options HAVECACHE # Sun3/260 VAC +include "../../../conf/GENERIC" -# Needs to be set per system. i.e change these as you see fit -maxusers 4 -# Standard system options -options KTRACE # system call tracing support +# Options for some specific Sun3 models +option FPU_EMULATE # for 3/50 models without FPU +option HAVECACHE # for 3/260 VAC -# Debugging options. Uncomment either this: -options DDB -# ... or these two: (for KGDB on another machine) -#makeoptions DEBUG="-g" # symbols for kgdb + nm -#options KGDB +maxusers 4 # estimated number of users -# Filesystem options -options NFSSERVER # nfs server support -options NFSCLIENT # nfs client support -options FFS # ufs file system -# -options CD9660 # ISO 9660 + Rock Ridge file system -options FDESC # /dev/fd/* -options FIFO # FIFOs; RECOMMENDED -options KERNFS # /kern -options NULLFS # loopback file system -options PROCFS # /proc -options UNION # union file system -options MFS # memory-based filesystem +config bsd swap generic -# Networking options -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...) -options NFS_BOOT_RWSIZE=1024 +# The root node: +mainbus0 at root -# Compatability options -options COMPAT_SUNOS # can run SunOS 4.1.1 executables -options COMPAT_43 # and 4.3BSD and ... -options COMPAT_10 # NetBSD 1.0 -options COMPAT_11 # NetBSD 1.1 -options COMPAT_12 # NetBSD 1.2 +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? -# Sun3-specific debugging options -options PMAP_DEBUG -#options VMFAULT_TRACE -#options SYSCALL_DEBUG -#options EXEC_DEBUG -options DIAGNOSTIC -#options SCSIDEBUG +# Devices that should be present in any Sun3 kernel. -config bsd swap generic +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 # # Serial ports @@ -172,3 +151,121 @@ pseudo-device tun 2 # network tunneling over tty pseudo-device pty 64 # pseudo-terminals #pseudo-device vnd 4 # paging to files +kbd0 at zsc0 channel 0 # keyboard +ms0 at zsc0 channel 1 # mouse + +# +# Network devices +# + +# Intel Ethernet (onboard, or VME) +ie0 at obio0 addr 0x0C0000 level 3 +ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75 + +# Lance Ethernet (only onboard) +le0 at obio0 addr 0x120000 level 3 +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG + +# +# Disk and tape devices +# + +# 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 flags 0x07 +si0 at vmes0 addr 0xff200000 level 2 vect 0x40 flags 0x07 +si1 at vmes0 addr 0xff204000 level 2 vect 0x41 flags 0x07 + +# 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 ? + +# Xylogics 472 tape controllers? + +# +# Frame buffer devices +# + +# The default cgfour address depends on the machine: +# 3/60: obmem 0xFF200000 .. 0xFF9fffff +# 3/110: different? (not tested) +cgfour0 at obmem0 addr ? + +# 3/60 P4 accelerated 8-bit color frame buffer +# cgsix0 at obmem0 addr ? + +# 3/60 P4 24-bit color frame buffer +# cgeight0 at obmem0 addr ? + +# The default bwtwo address depends on the machine: +# 3/50: obmem 0x100000 +# else: obmem 0xff000000 +bwtwo0 at obmem0 addr ? +# 3/60 P4 color frame buffer overlay plane, or P4 monochrome frame buffer +#bwtwo1 at obmem0 addr 0xff300000 +# 3/60 plug-in color frame buffer overlay plane +#bwtwo1 at obmem0 addr 0xff400000 + +# Sun-3 color board, or CG5 8-bit VME frame buffer. +cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8 + +# Support for the CG9 24-bit VME frame buffer. +# cgnine0 at vmel0 addr 0x08000000 + +# +# SCSI infrastructure +# +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 ? +ss* at scsibus? target ? lun ? +uk* at scsibus? target ? lun ? + +# Networking options +# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) +option NFS_BOOT_RWSIZE=1024 + +# Compatibility options +option COMPAT_SUNOS # can run SunOS 4.1.1 executables + +# Sun3-specific debugging options +option PMAP_DEBUG +#option VMFAULT_TRACE +#option SYSCALL_DEBUG +#option EXEC_DEBUG +#option SCSIDEBUG + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC index d904f24cebe..a1d65d4f23c 100644 --- a/sys/arch/sun3/conf/GENERIC +++ b/sys/arch/sun3/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.20 2000/05/26 00:07:27 miod Exp $ +# $OpenBSD: GENERIC,v 1.21 2000/05/26 00:44:21 miod Exp $ # $NetBSD: GENERIC,v 1.27.4.1 1996/08/19 23:35:06 gwr Exp $ # @@ -6,64 +6,41 @@ # Supports root on: ie0, le0, sd*, ... # -include "arch/sun3/conf/std.sun3" +# machine architecture; required by config(8) +machine sun3 m68k -# Machines to be supported by this kernel -option GENERIC -option FPU_EMULATE -option HAVECACHE # Sun3/260 VAC +include "../../../conf/GENERIC" -# Needs to be set per system. i.e change these as you see fit -maxusers 4 -# Standard system options -option KTRACE # system call tracing support +# Options for some specific Sun3 models +option FPU_EMULATE # for 3/50 models without FPU +option HAVECACHE # for 3/260 VAC -# Debugging options. Uncomment either this: -option DDB -# ... or these two: (for KGDB on another machine) -#makeoptions DEBUG="-g" # symbols for kgdb + nm -#option KGDB +maxusers 4 # estimated number of users -# Filesystem options -option NFSSERVER # nfs server support -option NFSCLIENT # nfs client support -option FFS # ufs file system -# -option CD9660 # ISO 9660 + Rock Ridge file system -option FDESC # /dev/fd/* -option FIFO # FIFOs; RECOMMENDED -option KERNFS # /kern -option NULLFS # loopback file system -option PROCFS # /proc -option UNION # union file system -option MFS # memory-based filesystem +config bsd swap generic -# Networking options -option INET # IP prototol stack support -option IPFILTER # IP packet filter for security -option IPFILTER_LOG # use /dev/ipl to log IPF -#option GATEWAY # IP packet forwarding -#option TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD -# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) -option NFS_BOOT_RWSIZE=1024 +# The root node: +mainbus0 at root -# Compatability options -option COMPAT_SUNOS # can run SunOS 4.1.1 executables -option COMPAT_43 # and 4.3BSD and ... -option COMPAT_10 # NetBSD 1.0 -option COMPAT_11 # NetBSD 1.1 -option COMPAT_12 # NetBSD 1.2 +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? -# Sun3-specific debugging options -option PMAP_DEBUG -#option VMFAULT_TRACE -#option SYSCALL_DEBUG -#option EXEC_DEBUG -option DIAGNOSTIC -#option SCSIDEBUG +# Devices that should be present in any Sun3 kernel. -config bsd swap generic +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 # # Serial ports @@ -84,6 +61,9 @@ ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75 # Lance Ethernet (only onboard) le0 at obio0 addr 0x120000 level 3 +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG # # Disk and tape devices @@ -169,16 +149,19 @@ ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? -pseudo-device loop 1 # network loopback -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 enc 4 # encryption device +# Networking options +# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) +option NFS_BOOT_RWSIZE=1024 + +# Compatibility options +option COMPAT_SUNOS # can run SunOS 4.1.1 executables -pseudo-device pty 64 # pseudo-terminals -pseudo-device vnd 4 # paging to files -pseudo-device ksyms 1 # kernel symbols device +# Sun3-specific debugging options +option PMAP_DEBUG +#option VMFAULT_TRACE +#option SYSCALL_DEBUG +#option EXEC_DEBUG +#option SCSIDEBUG # for IPv6 pseudo-device gif 4 diff --git a/sys/arch/sun3/conf/GENERIC_KGDB b/sys/arch/sun3/conf/GENERIC_KGDB deleted file mode 100644 index a0d4abafc3b..00000000000 --- a/sys/arch/sun3/conf/GENERIC_KGDB +++ /dev/null @@ -1,185 +0,0 @@ -# $OpenBSD: GENERIC_KGDB,v 1.7 2000/05/26 00:07:27 miod Exp $ -# $NetBSD: GENERIC_KGDB,v 1.1.2.1 1996/08/19 23:35:07 gwr Exp $ - -# -# GENERIC_KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260) -# like GENERIC but supports KGDB (gdb -k on other machine) -# - -include "arch/sun3/conf/std.sun3" - -# Machines to be supported by this kernel -option GENERIC -option FPU_EMULATE -option HAVECACHE # Sun3/260 VAC - -# Needs to be set per system. i.e change these as you see fit -maxusers 4 - -# Standard system options -option KTRACE # system call tracing support - -# Debugging options. Uncomment either this: -#option DDB -# ... or these two: (for KGDB on another machine) -makeoptions DEBUG="-g" # symbols for kgdb + nm -option KGDB - -# Filesystem options -option NFSSERVER # nfs server support -option NFSCLIENT # nfs client support -option FFS # ufs file system -# -option CD9660 # ISO 9660 + Rock Ridge file system -option FDESC # /dev/fd/* -option FIFO # FIFOs; RECOMMENDED -option KERNFS # /kern -option NULLFS # loopback file system -option PROCFS # /proc -option UNION # union file system -option MFS # memory-based filesystem - -# Networking options -option INET # IP prototol stack support -option IPFILTER # IP packet filter for security -option IPFILTER_LOG # use /dev/ipl to log IPF -#option GATEWAY # IP packet forwarding -#option TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD -# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) -option NFS_BOOT_RWSIZE=1024 - -# Compatability options -option COMPAT_SUNOS # can run SunOS 4.1.1 executables -option COMPAT_43 # and 4.3BSD and ... -option COMPAT_10 # NetBSD 1.0 -option COMPAT_11 # NetBSD 1.1 -option COMPAT_12 # NetBSD 1.2 - -# Sun3-specific debugging options -option PMAP_DEBUG -#option VMFAULT_TRACE -#option SYSCALL_DEBUG -#option EXEC_DEBUG -option DIAGNOSTIC -#option SCSIDEBUG - -config bsd swap generic - -# -# Serial ports -# -zstty0 at zsc1 channel 0 # ttya -zstty1 at zsc1 channel 1 # ttyb - -kbd0 at zsc0 channel 0 # keyboard -ms0 at zsc0 channel 1 # mouse - -# -# Network devices -# - -# Intel Ethernet (onboard, or VME) -ie0 at obio0 addr 0x0C0000 level 3 -ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75 - -# Lance Ethernet (only onboard) -le0 at obio0 addr 0x120000 level 3 - -# -# Disk and tape devices -# - -# 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 ? - -# Xylogics 472 tape controllers? - -# -# Frame buffer devices -# - -# The default cgfour address depends on the machine: -# 3/60: obmem 0xFF200000 .. 0xFF9fffff -# 3/110: different? (not tested) -cgfour0 at obmem0 addr ? - -# 3/60 P4 accelerated 8-bit color frame buffer -# cgsix0 at obmem0 addr ? - -# 3/60 P4 24-bit color frame buffer -# cgeight0 at obmem0 addr ? - -# The default bwtwo address depends on the machine: -# 3/50: obmem 0x100000 -# else: obmem 0xff000000 -bwtwo0 at obmem0 addr ? -# 3/60 P4 color frame buffer overlay plane, or P4 monochrome frame buffer -#bwtwo1 at obmem0 addr 0xff300000 -# 3/60 plug-in color frame buffer overlay plane -#bwtwo1 at obmem0 addr 0xff400000 - -# Sun-3 color board, or CG5 8-bit VME frame buffer. -cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8 - -# Support for the CG9 24-bit VME frame buffer. -# cgnine0 at vmel0 addr 0x08000000 - -# -# SCSI infrastructure -# -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 ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? - -pseudo-device loop 1 # network loopback -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 enc 4 # encryption device - -pseudo-device pty 64 # pseudo-terminals -pseudo-device vnd 4 # paging to files -pseudo-device ksyms 1 # kernel symbols device - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK index d906bfff7b1..6b4a0c04dec 100644 --- a/sys/arch/sun3/conf/RAMDISK +++ b/sys/arch/sun3/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.14 2000/05/26 00:07:27 miod Exp $ +# $OpenBSD: RAMDISK,v 1.15 2000/05/26 00:44:21 miod Exp $ # $NetBSD: RAMDISK,v 1.3.4.1 1996/08/19 23:35:10 gwr Exp $ # @@ -9,7 +9,34 @@ # install the miniroot in the swap partition # -include "arch/sun3/conf/std.sun3" + +machine sun3 m68k + +# The root node: +mainbus0 at root + +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? + +# Devices that should be present in any Sun3 kernel. + +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 + +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG # Machines to be supported by this kernel option FPU_EMULATE # XXX - Should not be needed! diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST index 8706014d589..9bc3437a5d5 100644 --- a/sys/arch/sun3/conf/SMD_TEST +++ b/sys/arch/sun3/conf/SMD_TEST @@ -1,69 +1,45 @@ -# $OpenBSD: SMD_TEST,v 1.12 2000/05/26 00:07:27 miod Exp $ +# $OpenBSD: SMD_TEST,v 1.13 2000/05/26 00:44:22 miod Exp $ # $NetBSD: SMD_TEST,v 1.2.4.1 1996/08/19 23:35:11 gwr Exp $ # # SMD_TEST - for Sun3 (3/50, 3/60, 3/110, 3/160, 3/260) -# Like GENERIC, but includes the SMD disk drivers (xd, xy) # -include "arch/sun3/conf/std.sun3" +# machine architecture; required by config(8) +machine sun3 m68k -# Machines to be supported by this kernel -option GENERIC -option FPU_EMULATE -option HAVECACHE # Sun3/260 VAC +include "../../../conf/GENERIC" -# Needs to be set per system. i.e change these as you see fit -maxusers 4 -# Standard system options -option KTRACE # system call tracing support +# Options for some specific Sun3 models +option FPU_EMULATE # for 3/50 models without FPU +option HAVECACHE # for 3/260 VAC -# Debugging options. Uncomment either this: -option DDB -# ... or these two: (for KGDB on another machine) -#makeoptions DEBUG="-g" # symbols for kgdb + nm -#option KGDB +maxusers 4 # estimated number of users -# Filesystem options -option NFSSERVER # nfs server support -option NFSCLIENT # nfs client support -option FFS # ufs file system -# -option CD9660 # ISO 9660 + Rock Ridge file system -option FDESC # /dev/fd/* -option FIFO # FIFOs; RECOMMENDED -option KERNFS # /kern -option NULLFS # loopback file system -option PROCFS # /proc -option UNION # union file system -option MFS # memory-based filesystem +config bsd swap generic -# Networking options -option INET # IP prototol stack support -option IPFILTER # IP packet filter for security -option IPFILTER_LOG # use /dev/ipl to log IPF -#option GATEWAY # IP packet forwarding -#option TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD -# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) -option NFS_BOOT_RWSIZE=1024 +# The root node: +mainbus0 at root -# Compatability options -option COMPAT_SUNOS # can run SunOS 4.1.1 executables -option COMPAT_43 # and 4.3BSD and ... -option COMPAT_10 # NetBSD 1.0 -option COMPAT_11 # NetBSD 1.1 -option COMPAT_12 # NetBSD 1.2 +# device space +obio0 at mainbus? +# main memory +obmem0 at mainbus? +# VME D16 space +vmes0 at mainbus? +# VME D32 space +vmel0 at mainbus? -# Sun3-specific debugging options -option PMAP_DEBUG -#option VMFAULT_TRACE -#option SYSCALL_DEBUG -#option EXEC_DEBUG -option DIAGNOSTIC -#option SCSIDEBUG +# Devices that should be present in any Sun3 kernel. -config bsd swap generic +# OBIO +zsc0 at obio0 addr 0x000000 +zsc1 at obio0 addr 0x020000 +eeprom0 at obio0 addr 0x040000 +clock0 at obio0 addr 0x060000 +memerr0 at obio0 addr 0x080000 +intreg0 at obio0 addr 0x0A0000 # # Serial ports @@ -84,6 +60,9 @@ ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75 # Lance Ethernet (only onboard) le0 at obio0 addr 0x120000 level 3 +# All Sun3 machines with an "le" (3/50, 3/60) should be +# presumed to have the old, buggy LANCE chip. (Rev. C) +options LANCE_REVC_BUG # # Disk and tape devices @@ -94,15 +73,15 @@ le0 at obio0 addr 0x120000 level 3 # 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 +# 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 +si0 at obio0 addr 0x140000 level 2 flags 0x07 +si0 at vmes0 addr 0xff200000 level 2 vect 0x40 flags 0x07 +si1 at vmes0 addr 0xff204000 level 2 vect 0x41 flags 0x07 # Xylogics 7053 controllers xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44 @@ -169,16 +148,19 @@ ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? -pseudo-device loop 1 # network loopback -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 enc 4 # encryption device +# Networking options +# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) +option NFS_BOOT_RWSIZE=1024 + +# Compatibility options +option COMPAT_SUNOS # can run SunOS 4.1.1 executables -pseudo-device pty 64 # pseudo-terminals -#pseudo-device vnd 4 # paging to files -pseudo-device ksyms 1 # kernel symbols device +# Sun3-specific debugging options +option PMAP_DEBUG +#option VMFAULT_TRACE +#option SYSCALL_DEBUG +#option EXEC_DEBUG +#option SCSIDEBUG # for IPv6 pseudo-device gif 4 diff --git a/sys/arch/sun3/conf/std.sun3 b/sys/arch/sun3/conf/std.sun3 deleted file mode 100644 index adf068ab9e9..00000000000 --- a/sys/arch/sun3/conf/std.sun3 +++ /dev/null @@ -1,41 +0,0 @@ -# $OpenBSD: std.sun3,v 1.7 2000/04/30 15:27:57 miod Exp $ -# $NetBSD: std.sun3,v 1.19 1996/11/19 21:04:50 gwr Exp $ - -# Standard information for sun3's. -machine sun3 m68k - -# The root node: -mainbus0 at root - -# device space -obio0 at mainbus? -# main memory -obmem0 at mainbus? -# VME D16 space -vmes0 at mainbus? -# VME D32 space -vmel0 at mainbus? - -# Devices that should be present in any Sun3 kernel. - -# OBIO -zsc0 at obio0 addr 0x000000 -zsc1 at obio0 addr 0x020000 -eeprom0 at obio0 addr 0x040000 -clock0 at obio0 addr 0x060000 -memerr0 at obio0 addr 0x080000 -intreg0 at obio0 addr 0x0A0000 - -# Standard defines -options EXEC_AOUT -options EXEC_SCRIPT -options SWAPPAGER, DEVPAGER - -# XXX - Still needed? -options NEWCONFIG -options MACHINE_NONCONTIG - -# All Sun3 machines with an "le" (3/50, 3/60) should be -# presumed to have the old, buggy LANCE chip. (Rev. C) -options LANCE_REVC_BUG - |