summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-02-19 20:52:26 +0000
committermiod <miod@openbsd.org>2013-02-19 20:52:26 +0000
commit650c88a8a29ebaad0e7a424d9a3a21477b725848 (patch)
tree34e73d4061c8fb0f2fafee5e740be88c996147c2
parentRevert rev 1.195 forcing Intel SATA controllers in compat mode into AHCI mode. (diff)
downloadwireguard-openbsd-650c88a8a29ebaad0e7a424d9a3a21477b725848.tar.xz
wireguard-openbsd-650c88a8a29ebaad0e7a424d9a3a21477b725848.zip
Introduce `option M88410', to be added to 88110 system designs making use of the
#$%&#@! MC88410 chip. This will allow design-agonstic m88k-specific code to be able to tell pure 88110 kernels apart from possible 88110+88410 ones.
-rw-r--r--sys/arch/mvme88k/conf/GENERIC9
-rw-r--r--sys/arch/mvme88k/conf/M1975
-rw-r--r--sys/arch/mvme88k/conf/RAMDISK9
3 files changed, 13 insertions, 10 deletions
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 72017ad2b38..fa1c9110349 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.55 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: GENERIC,v 1.56 2013/02/19 20:52:26 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -16,10 +16,11 @@ maxusers 32 # estimated number of users
# Processor type
option M88100
option M88110
+option M88410
-option MVME187 # support for 187 (requires M88100)
-option MVME188 # support for 188 (requires M88100)
-option MVME197 # support for 197 (requires M88110)
+option MVME187 # support for MVME187 (requires M88100)
+option MVME188 # support for MVME188 (requires M88100)
+option MVME197 # support for MVME197 (requires M88110, M88410)
# Define this if your processor has the xxx.usr bug (mask C82N)
option ERRATA__XXX_USR
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index c9f056a824d..a80fd6a8a38 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-# $OpenBSD: M197,v 1.34 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: M197,v 1.35 2013/02/19 20:52:26 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -15,8 +15,9 @@ maxusers 32 # estimated number of users
# Processor type
option M88110
+option M88410
-option MVME197 # support for 197 (requires M88110)
+option MVME197 # support for MVME197 (requires M88110, M88410)
config bsd swap generic
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index 2b7799b50e5..15311e39270 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.34 2011/11/08 19:22:13 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.35 2013/02/19 20:52:26 miod Exp $
machine mvme88k m88k
@@ -9,10 +9,11 @@ option RAMDISK_HOOKS
# Processor type
option M88100
option M88110
+option M88410
-option MVME187 # support for 187 (requires M88100)
-option MVME188 # support for 188 (requires M88100)
-option MVME197 # support for 197 (requires M88110)
+option MVME187 # support for MVME187 (requires M88100)
+option MVME188 # support for MVME188 (requires M88100)
+option MVME197 # support for MVME197 (requires M88110, M88410)
# Define this if your processor has the xxx.usr bug (mask C82N)
option ERRATA__XXX_USR