Add magic to the kernel Makefile to remove the need to explicitely put

the processor type in the configuration files, if you specify a board type.
Also, some syntaxic sugar for the MVME187 case as well.

6 files changed, 66 insertions, 34 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 2495e574c13..edd06b8ffa2 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,20 +1,20 @@
-#	$OpenBSD: GENERIC,v 1.24 2001/12/13 19:02:38 miod Exp $
+#	$OpenBSD: GENERIC,v 1.25 2001/12/13 20:32:56 miod Exp $
 
 machine		mvme88k 
 
 include "../../../conf/GENERIC"
 
-option		M88100		# support for mc88100 1st generation RISC
-option		M88110		# support for mc88120 2ond generation RISC
-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 187
+option		MVME188		# support for 188
+#option		MVME197		# support for 197
 option		"NCPUS=1"	# number of CPUs supported (max 4)
 option		BUGMAP		# use the Bug ROM VME mappings
+
 #option		DEBUG		# print debugging statements
 #option		EH_DEBUG	# debugging code for exception handlers
 
 # Define this if your processor has the xxx.usr bug (mask C82N)
+# In doubt, leave it enabled.
 option		ERRATA__XXX_USR	
 
 maxusers	64
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 42f0534c32a..c252451bc8a 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,17 +1,17 @@
-#	$OpenBSD: M187,v 1.15 2001/12/13 08:55:51 smurph Exp $
+#	$OpenBSD: M187,v 1.16 2001/12/13 20:32:56 miod Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-option		M88100		# support for mc88100 1st generation RISC
-option		MVME187		# support for 187 (requires M88100)
-option		"NCPUS=1"	# Number of cpus supported (max 4)
+option		MVME187		# support for 187
 option		BUGMAP		# use Bug Rom VME Mappings
+
 #option		DEBUG		# print debugging statements
 #option		EH_DEBUG	# debugging code for exception handlers
 
 # Define this if your processor has the xxx.usr bug (mask C82N)
+# In doubt, leave it enabled.
 option		ERRATA__XXX_USR	
 
 maxusers 64
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index 0da9a562584..69e6d6631ab 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,19 +1,18 @@
-#	$OpenBSD: M188,v 1.12 2001/12/13 08:55:51 smurph Exp $
+#	$OpenBSD: M188,v 1.13 2001/12/13 20:32:56 miod Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-# processors this kernel should support
-
-option		M88100		# support for mc88100 1st generation RISC
 option		MVME188		# support for 188 (requires M88100)
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
+
 #option		DEBUG		# print debugging statements
 #option		EH_DEBUG	# debugging code for exception handlers
 
 # Define this if your processor has the xxx.usr bug (mask C82N)
+# In doubt, leave it enabled.
 option		ERRATA__XXX_USR	
 
 maxusers 64
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 68804b99a1d..9bdf5e35859 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,19 +1,18 @@
-#	$OpenBSD: M197,v 1.10 2001/12/13 08:55:51 smurph Exp $
+#	$OpenBSD: M197,v 1.11 2001/12/13 20:32:56 miod Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-# processors this kernel should support
-
-option		M88110		# support for mc88120 2ond generation RISC
 option		MVME197		# support for 197 (requires M88110)
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
+
 #option		DEBUG		# print debugging statements
 #option		EH_DEBUG	# debugging code for exception handlers
 
 # Define this if your processor has the xxx.usr bug (mask C82N)
+# In doubt, leave it enabled.
 option		ERRATA__XXX_USR	
 
 maxusers 64
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 264ca1b8709..805fd21a6ce 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.14 2001/08/26 14:31:36 miod Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.15 2001/12/13 20:32:56 miod Exp $
 #
 # Makefile for OpenBSD
 #
@@ -54,6 +54,20 @@ HOSTCC?=	${CC}
 HOSTED_CPPFLAGS?=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS?=	${CFLAGS}
 
+### CPU configuration
+
+.if (${IDENT:M-DMVME187} != "" || ${IDENT:M-DMVME188} != "")
+CPPFLAGS+=	-DM88100
+.endif
+.if (${IDENT:M-DMVME197} != "")
+CPPFLAGS+=	-DM88110
+.endif
+
+# syntaxic sugar for 187, which do not exist with multiple processors
+.if (${IDENT:M-DMVME187} != "" && ${IDENT:M-DNCPUS} == "")
+CPPFLAGS+=	-DNCPUS=1
+.endif
+
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index 56cc1ed5d20..053e45a0738 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,31 +1,49 @@
-#	$OpenBSD: RAMDISK,v 1.7 2001/08/23 22:04:32 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.8 2001/12/13 20:32:56 miod Exp $
 
 machine		mvme88k 
 
-include "../../../conf/GENERIC"
+maxusers	2
+
+option		RAMDISK_HOOKS
+option		MINIROOTSIZE=8192
+
+option		TIMEZONE=0
+option		DST=0
+
+option		SMALL_KERNEL
+option		DIAGNOSTIC
+option		FFS		# UFS
+option		NFSCLIENT	# Network File System client
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		INET		# IP + ICMP + TCP + UDP
+option		BOOT_CONFIG	# add support for boot -c
 
 option		MVME187		# support for 187
 option		MVME188		# support for 188
-option		MVME197		# support for 197
+#option		MVME197		# support for 197
 
 option		"NCPUS=1"	# number of CPUs supported (max 4)
 option		BUGMAP		# use the Bug ROM VME mappings
 
-maxusers	8
+# Define this if your processor has the xxx.usr bug (mask C82N)
+# In doubt, leave it enabled.
+option		ERRATA__XXX_USR	
 
-config		bsd		root rd0 swap rd0
+config		bsd		root on rd0a
 
 # ------------------------------ devices --------------------------------
 mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
-bugtty0 at mainbus0
-busswitch0 at mainbus0 addr 0xfff00000
-pcctwo0 at mainbus0 addr 0xfff00000
-syscon0 at mainbus0 addr 0xfff00000
+bugtty0	at mainbus0
+bussw0	at mainbus0 addr 0xfff00000
+pcctwo0	at mainbus0 addr 0xfff00000
+syscon0	at mainbus0 addr 0xfff00000
 
-# ----------------------------- busswicth devices -----------------------
-pcctwo0 at busswitch0 offset 0x42000
+# ------------------------------ bussw devices --------------------------
+pcctwo0 at bussw0 offset 0x42000
 
 # ------------------------------ pcctwo devices -------------------------
 clock0	at pcctwo0 ipl 5
@@ -62,7 +80,7 @@ vs3	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
 vs4	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
 vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
 
-# ------------------------------ svme0 devices -------------------------
+# ------------------------------ vs0 devices -------------------------
 scsibus* at vs?
 
 # ------------------------------ ssh0 devices --------------------------
@@ -74,6 +92,8 @@ st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
 # ------------------------------ pseudo devices ------------------------
-option MINIROOTSIZE=8192
-option RAMDISK_HOOKS
-pseudo-device	rd 2
+
+pseudo-device	rd	2
+pseudo-device	loop	1	# network loopback
+pseudo-device	bpfilter 1	# packet filter
+pseudo-device	pty	4	# pseudo-terminals