summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-07-08 21:26:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-07-08 21:26:33 +0000
commit4eae054a502279c318b57b33d063288fe4d512c4 (patch)
tree435f93ec49694e3697b14844ad9601eea48b202d /sys/arch
parent0e531a657606c1bc0f467151e4507567d11911f1 (diff)
std.alpha goes foom
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/ALATAR6
-rw-r--r--sys/arch/alpha/conf/ALPHA6
-rw-r--r--sys/arch/alpha/conf/AXPPCI336
-rw-r--r--sys/arch/alpha/conf/BUNNY6
-rw-r--r--sys/arch/alpha/conf/GENERIC6
-rw-r--r--sys/arch/alpha/conf/GENERIC.PROF6
-rw-r--r--sys/arch/alpha/conf/JURA6
-rw-r--r--sys/arch/alpha/conf/LOKI6
-rw-r--r--sys/arch/alpha/conf/NOSY6
-rw-r--r--sys/arch/alpha/conf/OPAL6
-rw-r--r--sys/arch/alpha/conf/RAMDISK6
-rw-r--r--sys/arch/alpha/conf/std.alpha18
12 files changed, 33 insertions, 51 deletions
diff --git a/sys/arch/alpha/conf/ALATAR b/sys/arch/alpha/conf/ALATAR
index 680170273ec..58e6c13def6 100644
--- a/sys/arch/alpha/conf/ALATAR
+++ b/sys/arch/alpha/conf/ALATAR
@@ -1,9 +1,9 @@
-# $OpenBSD: ALATAR,v 1.2 1997/06/02 13:17:28 deraadt Exp $
+# $OpenBSD: ALATAR,v 1.3 1997/07/08 21:26:26 deraadt Exp $
#
# AXPpci 33 kernel. Enough to get booted, etc., but not much more.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 46d4c45155a..25fee024162 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,10 +1,10 @@
-# $OpenBSD: ALPHA,v 1.10 1997/06/02 13:17:28 deraadt Exp $
+# $OpenBSD: ALPHA,v 1.11 1997/07/08 21:26:27 deraadt Exp $
# $NetBSD: ALPHA,v 1.30 1996/12/03 17:25:27 cgd Exp $
#
# Alpha kernel with all the options you'd want, and more.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/AXPPCI33 b/sys/arch/alpha/conf/AXPPCI33
index 4e7735e109d..b303ff778a6 100644
--- a/sys/arch/alpha/conf/AXPPCI33
+++ b/sys/arch/alpha/conf/AXPPCI33
@@ -1,11 +1,11 @@
-# $OpenBSD: AXPPCI33,v 1.2 1997/06/02 13:17:29 deraadt Exp $
+# $OpenBSD: AXPPCI33,v 1.3 1997/07/08 21:26:27 deraadt Exp $
#
# Generic Alpha AXPPCI33 (NoName) kernel.
# Enough to get booted, etc., but not much more.
#
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY
index da6895c969a..77c28320329 100644
--- a/sys/arch/alpha/conf/BUNNY
+++ b/sys/arch/alpha/conf/BUNNY
@@ -1,4 +1,4 @@
-# $OpenBSD: BUNNY,v 1.9 1997/06/02 13:17:29 deraadt Exp $
+# $OpenBSD: BUNNY,v 1.10 1997/07/08 21:26:28 deraadt Exp $
# $NetBSD: BUNNY,v 1.12 1996/11/25 04:16:15 cgd Exp $
#
# Kernel for bunnahabhain.pdl.cs.cmu.edu.
@@ -6,8 +6,8 @@
# Trimmed down kernel for AlphaStation [24]xx systems, with lots
# of buffer cache.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# bump up the number of buffers, for quicker compiles
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index a9c0a4b0f7c..9b14381993d 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,10 +1,10 @@
-# $OpenBSD: GENERIC,v 1.20 1997/07/06 18:37:34 niklas Exp $
+# $OpenBSD: GENERIC,v 1.21 1997/07/08 21:26:28 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/GENERIC.PROF b/sys/arch/alpha/conf/GENERIC.PROF
index b34280230a2..a1fadb206c9 100644
--- a/sys/arch/alpha/conf/GENERIC.PROF
+++ b/sys/arch/alpha/conf/GENERIC.PROF
@@ -1,10 +1,10 @@
-# $OpenBSD: GENERIC.PROF,v 1.3 1997/06/02 13:17:30 deraadt Exp $
+# $OpenBSD: GENERIC.PROF,v 1.4 1997/07/08 21:26:29 deraadt Exp $
# $NetBSD: GENERIC.PROF,v 1.10 1996/12/03 17:25:31 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# Always include profiling support; does not need 'config -p'.
diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA
index c7caa6c8c75..650648c5b97 100644
--- a/sys/arch/alpha/conf/JURA
+++ b/sys/arch/alpha/conf/JURA
@@ -1,12 +1,12 @@
-# $OpenBSD: JURA,v 1.8 1997/01/24 19:56:57 niklas Exp $
+# $OpenBSD: JURA,v 1.9 1997/07/08 21:26:29 deraadt Exp $
# $NetBSD: JURA,v 1.11 1996/11/25 04:16:18 cgd Exp $
#
# Kernel for jura.pdl.cs.cmu.edu.
#
# THIS KERNEL DOES NOT CURRENTLY WORK, OR EVEN CONFIGURE!
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/LOKI b/sys/arch/alpha/conf/LOKI
index a0295d90ae2..b8722ca0d6f 100644
--- a/sys/arch/alpha/conf/LOKI
+++ b/sys/arch/alpha/conf/LOKI
@@ -1,10 +1,10 @@
-# $OpenBSD: LOKI,v 1.1 1997/06/24 12:48:18 kstailey Exp $
+# $OpenBSD: LOKI,v 1.2 1997/07/08 21:26:30 deraadt Exp $
#
# LOKI, an Alpha AXPPCI33 (NoName) kernel.
#
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/NOSY b/sys/arch/alpha/conf/NOSY
index b2a48304b5b..4df84a73b0c 100644
--- a/sys/arch/alpha/conf/NOSY
+++ b/sys/arch/alpha/conf/NOSY
@@ -1,11 +1,11 @@
-# $OpenBSD: NOSY,v 1.6 1997/01/24 19:56:59 niklas Exp $
+# $OpenBSD: NOSY,v 1.7 1997/07/08 21:26:30 deraadt Exp $
# $NetBSD: NOSY,v 1.10 1996/11/15 19:37:31 cgd Exp $
#
# Jason's DEC 3000/400 in the lab...
#
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/OPAL b/sys/arch/alpha/conf/OPAL
index 943a12c99e8..3af1d973d7a 100644
--- a/sys/arch/alpha/conf/OPAL
+++ b/sys/arch/alpha/conf/OPAL
@@ -1,9 +1,9 @@
-# $OpenBSD: OPAL,v 1.6 1997/02/26 16:31:16 niklas Exp $
+# $OpenBSD: OPAL,v 1.7 1997/07/08 21:26:31 deraadt Exp $
#
# OPAL, kernel for a DEC Multia at Applitron
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index e1032d78ad4..99525f89084 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,10 +1,10 @@
-# $OpenBSD: RAMDISK,v 1.8 1997/07/05 23:10:40 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.9 1997/07/08 21:26:31 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
-include "arch/alpha/conf/std.alpha"
-
+machine alpha
+option SWAPPAGER, DEVPAGER
maxusers 8
# CPU Support
diff --git a/sys/arch/alpha/conf/std.alpha b/sys/arch/alpha/conf/std.alpha
deleted file mode 100644
index 93b934d7b9e..00000000000
--- a/sys/arch/alpha/conf/std.alpha
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: std.alpha,v 1.7 1997/06/02 13:23:17 deraadt Exp $
-# $NetBSD: std.alpha,v 1.11 1996/11/15 19:37:34 cgd Exp $
-#
-# Standard/required configuration info for OpenBSD/alpha.
-
-machine alpha
-
-makeoptions DEBUG="-g"
-
-# standard ("mandatory") kernel options.
-
-# Executable support: once transitioned to ELF, EXEC_ECOFF will become optional
-options EXEC_ECOFF # (native) ECOFF binary support
-options EXEC_ELF64 # (native) ELF64 binary support
-
-# VM pager support
-options SWAPPAGER # paging; REQUIRED
-options DEVPAGER # mmap() of devices; REQUIRED