summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-08-19 00:07:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-08-19 00:07:33 +0000
commita7e79e28969b3bf3dd0adda7632999a18aae58fd (patch)
treea04bc1f1abd16cb15ad70433739e1c480f20d65b /sys/arch/sparc
parent0f2e1590306b03e2d80157415625383a64cf8553 (diff)
use /sys/conf/GENERIC
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/conf/GENERIC56
-rw-r--r--sys/arch/sparc/conf/GENERIC_SCSI356
2 files changed, 6 insertions, 106 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 47b14c74271..e441bd004f5 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -3,6 +3,8 @@
# Machine architecture; required by config(8)
machine sparc
+include "../../../conf/GENERIC"
+
# Options for variants of the Sun SPARC architecure.
# At least one is required.
options SUN4 # sun4/100, sun4/200, sun4/300
@@ -11,67 +13,15 @@ options SUN4M # sun4m - SS10, SS20, Classic, etc.
#options MMU_3L # 3-level MMU on sun4/400
-# obsolete timezone spec; optional
-#options TIMEZONE=0, DST=0
-
-# Standard system options
-options SWAPPAGER # swap and anonymous memory; required
-options VNODEPAGER # mapped files; required
-options DEVPAGER # mapped devices; required
-options KTRACE # system call tracing
-options SYSVMSG # System V message queues
-options SYSVSEM # System V semaphores
-options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-options LKM # loadable kernel modules
-#options INSECURE # disable kernel security level
-#options UCONSOLE # allow anyone to steal the virtual console
-
-# Debugging options
-#options DDB # kernel dynamic debugger
-#options DEBUG # kernel debugging code
-#options DIAGNOSTIC # extra kernel sanity checking
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01 # kgdb device number (dev_t)
#options KGDBRATE=38400 # baud rate
-# Compatibility options
-options COMPAT_43 # 4.3BSD system interfaces
-options COMPAT_10 # NetBSD 1.0 binary compatibility
-options COMPAT_11 # NetBSD 1.1 binary compatibility
-options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
-
-# Filesystem options
-options FFS # Berkeley Fast Filesystem
-options QUOTA # FFS quotas
-options NFSSERVER # Sun NFS-compatible filesystem server
-options NFSCLIENT # Sun NFS-compatible filesystem client
-options KERNFS # kernel data-structure filesystem
-options NULLFS # NULL layered filesystem
-options MFS # memory-based filesystem
-options FDESC # user file descriptor filesystem
-options UMAPFS # uid/gid remapping filesystem
-options LFS # Log-based filesystem (still experimental)
-options PORTAL # portal filesystem (still experimental)
-options PROCFS # /proc
-options CD9660 # ISO 9660 + Rock Ridge file system
-options UNION # union file system
-options FIFO # POSIX fifo support (in all filesystems)
-
-# Networking options
-options INET # IP stack
-options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
-#options GATEWAY # IP packet forwarding
-#options ISO,TPIP # OSI networking
-#options EON # OSI tunneling over IP
-#options CCITT,LLC,HDLC # X.25
-
# Options for SPARCstation hardware
options RASTERCONSOLE # fast rasterop console
# Generic swap; second partition of root disk or network.
-config netbsd swap generic
+config bsd swap generic
# Main bus and CPU .. all systems.
mainbus0 at root
diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index a160b2c2a29..d2fc42215cf 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -3,6 +3,8 @@
# Machine architecture; required by config(8)
machine sparc
+include "../../../conf/GENERIC"
+
# Options for variants of the Sun SPARC architecure.
# At least one is required.
options SUN4 # sun4/100, sun4/200, sun4/300
@@ -11,67 +13,15 @@ options SUN4M # sun4m - SS10, SS20, Classic, etc.
#options MMU_3L # 3-level MMU on sun4/400
-# obsolete timezone spec; optional
-#options TIMEZONE=0, DST=0
-
-# Standard system options
-options SWAPPAGER # swap and anonymous memory; required
-options VNODEPAGER # mapped files; required
-options DEVPAGER # mapped devices; required
-options KTRACE # system call tracing
-options SYSVMSG # System V message queues
-options SYSVSEM # System V semaphores
-options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-options LKM # loadable kernel modules
-#options INSECURE # disable kernel security level
-#options UCONSOLE # allow anyone to steal the virtual console
-
-# Debugging options
-#options DDB # kernel dynamic debugger
-#options DEBUG # kernel debugging code
-#options DIAGNOSTIC # extra kernel sanity checking
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01 # kgdb device number (dev_t)
#options KGDBRATE=38400 # baud rate
-# Compatibility options
-options COMPAT_43 # 4.3BSD system interfaces
-options COMPAT_10 # NetBSD 1.0 binary compatibility
-options COMPAT_11 # NetBSD 1.1 binary compatibility
-options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
-
-# Filesystem options
-options FFS # Berkeley Fast Filesystem
-options QUOTA # FFS quotas
-options NFSSERVER # Sun NFS-compatible filesystem server
-options NFSCLIENT # Sun NFS-compatible filesystem client
-options KERNFS # kernel data-structure filesystem
-options NULLFS # NULL layered filesystem
-options MFS # memory-based filesystem
-options FDESC # user file descriptor filesystem
-options UMAPFS # uid/gid remapping filesystem
-options LFS # Log-based filesystem (still experimental)
-options PORTAL # portal filesystem (still experimental)
-options PROCFS # /proc
-options CD9660 # ISO 9660 + Rock Ridge file system
-options UNION # union file system
-options FIFO # POSIX fifo support (in all filesystems)
-
-# Networking options
-options INET # IP stack
-options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
-#options GATEWAY # IP packet forwarding
-#options ISO,TPIP # OSI networking
-#options EON # OSI tunneling over IP
-#options CCITT,LLC,HDLC # X.25
-
# Options for SPARCstation hardware
options RASTERCONSOLE # fast rasterop console
# Generic swap; second partition of root disk or network.
-config netbsd swap generic
+config bsd swap generic
# Main bus and CPU .. all systems.
mainbus0 at root