Make all the low-profile configurations include conf/GENERIC, and

harmonize a bit.

4 files changed, 70 insertions, 222 deletions

diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index 3174bd3ee4b..94b98adc416 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,50 +1,20 @@
-#	$OpenBSD: MVME147,v 1.14 2001/06/27 05:46:19 art Exp $
+#	$OpenBSD: MVME147,v 1.15 2001/08/03 21:16:04 miod Exp $
 
 machine		mvme68k m68k
 
-#option		"M68040"	# support for 040
-#option		FPSP		# MC68040 floating point support
-option		"M68030"	# support for 030
+include "../../../conf/GENERIC"
+
+option		M68030		# support for 030
 
 option		MVME147		# (requires M68030)
-#option		MVME162		# (requires M68040)
-#option		MVME167		# includes 166 (requires M68040)
-
-maxusers	6
-
-# obsolete timezone spec
-option		TIMEZONE=0, DST=0
-
-#option		DIAGNOSTIC, DEBUG
-option		DDB
-option		FFS
-option		NFSCLIENT
-option		NFSSERVER
-option		SYSVSEM,SYSVMSG,SYSVSHM
-option 	KTRACE
-option 	COMPAT_43
-option 	FIFO
-#option		MFS
-option		DEVPAGER, SWAPPAGER
-#option		MSDOSFS
 
 option		COMPAT_SUNOS
+option		COMPAT_HPUX
+option		COMPAT_M68K4K
 
-# Networking options
-option		INET
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-option		GATEWAY		# IP packet forwarding
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
-
-config		bsd	swap generic
+maxusers	16
 
-#pseudo-device	sl
-#pseudo-device	ppp 2
-pseudo-device	loop
-pseudo-device	bpfilter
-pseudo-device	pty
+config		bsd		swap generic
 
 mainbus0 at root
 
@@ -54,47 +24,38 @@ clock0	at pcc0 ipl 5
 nvram0	at pcc0 offset 0x0000
 zs0	at pcc0 offset 0x3000 ipl 4
 zs1	at pcc0 offset 0x3800 ipl 4
-le0	at pcc0 offset 0x1800 ipl 1
+le*	at pcc0 offset 0x1800 ipl 1
 wdsc0	at pcc0 offset 0x4000 ipl 2
 lp0	at pcc0 ipl 1
 vme0	at pcc0 offset 0x2000
 
-# MVME162
-#mc0	at mainbus0 addr 0xfff00000
-#clock0	at mc0 ipl 5
-#nvram0	at mc0 offset 0xc0000
-#zs0	at mc0 offset 0x45000 ipl 4
-#zs1	at mc0 offset 0x45801 ipl 4
-#ie0	at mc0 offset 0x46000 ipl 1
-#ssh0	at mc0 offset 0x47000 ipl 2
-#memc0	at mc0 offset 0x43000
-#memc1	at mc0 offset 0x41000
-#ipic0	at mc0 offset 0xbc000
-#vme0	at mc0 offset 0x40000
-#flash0	at mainbus0 addr 0xffa00000
-#sram0	at mainbus0 addr 0xffe00000
-
-#fooip*	at ipic? manu 0x11 prod 0x22 ipl 1
-
-# MVME166/167/177
-#pcctwo0 at mainbus0 addr 0xfff00000
-#clock0	at pcctwo0 ipl 5
-#nvram0	at pcctwo0 offset 0xc0000
-#ie0	at pcctwo0 offset 0x46000 ipl 1
-#ssh0	at pcctwo0 offset 0x47000 ipl 2
-#cl0	at pcctwo0 offset 0x45000 ipl 3
-#vme0	at pcctwo0 offset 0x40000
-#lptwo0	at pcctwo0 ipl 1
-#memc0	at pcctwo0 offset 0x43000
-#memc1	at pcctwo0 offset 0x43100
-#sram0	at mainbus0 addr 0xffe00000
-
 vmes0	at vme0
+
+#vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
+#vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
+#vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
+#vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
+#vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
+#vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+
 vmel0	at vme0
 
 scsibus* at wdsc?
-#scsibus* at ssh?
+#scsibus* at vs?
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+ch*	at scsibus? target ? lun ?
+ss*	at scsibus? target ? lun ?
+uk*	at scsibus? target ? lun ?
+
+pseudo-device	rd 2
+
+#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
+#nxdc0	at vmes0 addr 0xff00ee80 ipl 2 vec 0x44
+#xd*	at xdc? target ?
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index aebd5fadbe7..234091f728a 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,64 +1,24 @@
-#	$OpenBSD: MVME162,v 1.17 2001/06/27 05:46:19 art Exp $
+#	$OpenBSD: MVME162,v 1.18 2001/08/03 21:16:04 miod Exp $
 
 machine		mvme68k m68k
 
-option		"M68040"	# support for 040
+include "../../../conf/GENERIC"
+
+option		M68040		# support for 040
 option		FPSP		# MC68040 floating point support
-#option		"M68030"	# support for 030
-
-#option		MVME147		# (requires M68030)
-option		MVME162		# (requires M68040)
-#option		MVME167		# includes 166 (requires M68040)
-
-maxusers	6
-
-# obsolete timezone spec
-option		TIMEZONE=0, DST=0
-
-#option		DIAGNOSTIC, DEBUG
-option		DDB
-option		FFS
-option		NFSCLIENT
-option		NFSSERVER
-option		SYSVSEM,SYSVMSG,SYSVSHM
-option 		KTRACE
-option 		COMPAT_43
-option 		FIFO
-#option		MFS
-option		DEVPAGER, SWAPPAGER
-#option		MSDOSFS
 
-option		COMPAT_SUNOS
+option		MVME162		# (requires M68040, FPSP)
 
-# Networking option
-option		INET
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-option		GATEWAY		# IP packet forwarding
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
+option		COMPAT_SUNOS
+option		COMPAT_HPUX
+option		COMPAT_M68K4K
 
-config		bsd	swap generic
+maxusers	32
 
-#pseudo-device	sl
-#pseudo-device	ppp 2
-pseudo-device	loop
-pseudo-device	bpfilter
-pseudo-device	pty
+config		bsd		swap generic
 
 mainbus0 at root
 
-# MVME147
-#pcc0	at mainbus0 addr 0xfffe0000
-#clock0	at pcc0 ipl 5
-#nvram0	at pcc0 offset 0x0000
-#zs0	at pcc0 offset 0x3000 ipl 4
-#zs1	at pcc0 offset 0x3800 ipl 4
-#le0	at pcc0 offset 0x1800 ipl 1
-#wdsc0	at pcc0 offset 0x4000 ipl 2
-##lp0	at pcc0 ipl 1
-#vme0	at pcc0 offset 0x2000
-
 # MVME162
 mc0	at mainbus0 addr 0xfff00000
 clock0	at mc0 ipl 5
@@ -68,7 +28,7 @@ zs1	at mc0 offset 0x45801 ipl 4
 ie0	at mc0 offset 0x46000 ipl 1
 ssh0	at mc0 offset 0x47000 ipl 2
 memc0	at mc0 offset 0x43000
-memc1	at mc0 offset 0x41000
+memc1	at mc0 offset 0x43100
 ipic0	at mc0 offset 0xbc000
 vme0	at mc0 offset 0x40000
 flash0	at mainbus0 addr 0xffa00000
@@ -76,21 +36,6 @@ sram0	at mainbus0 addr 0xffe00000
 
 fooip*	at ipic? manu 0x11 prod 0x22 ipl 1
 
-# MVME166/167/177
-#pcctwo0 at mainbus0 addr 0xfff00000
-#clock0	at pcctwo0 ipl 5
-#nvram0	at pcctwo0 offset 0xc0000
-#ie0	at pcctwo0 offset 0x46000 ipl 1
-#ssh0	at pcctwo0 offset 0x47000 ipl 2
-#cl0	at pcctwo0 offset 0x45000 ipl 3
-#vme0	at pcctwo0 offset 0x40000
-#lptwo0	at pcctwo0 ipl 1
-#memc0	at pcctwo0 offset 0x43000
-#memc1	at pcctwo0 offset 0x43100
-#sram0	at mainbus0 addr 0xffe00000
-
-#bugtty0 at mainbus0
-
 vmes0	at vme0
 
 vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
@@ -106,15 +51,18 @@ le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
 
 vmel0	at vme0
 
-#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
-#xdc0	at vmel0 addr 0xff00ee80 ipl 2 vec 0x44
-#xd*	at xdc? target ?
-
-#scsibus* at wdsc?
 scsibus* at ssh?
 scsibus* at vs?
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+ch*	at scsibus? target ? lun ?
+ss*	at scsibus? target ? lun ?
+uk*	at scsibus? target ? lun ?
+
+pseudo-device	rd 2
 
+#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
+#nxdc0	at vmes0 addr 0xff00ee80 ipl 2 vec 0x44
+#xd*	at xdc? target ?
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index 9e8f5c1d84c..9b974acc270 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,80 +1,24 @@
-#	$OpenBSD: MVME167,v 1.17 2001/06/27 05:46:20 art Exp $
+#	$OpenBSD: MVME167,v 1.18 2001/08/03 21:16:04 miod Exp $
 
 machine		mvme68k m68k
 
-option		"M68040"	# support for 040
+include "../../../conf/GENERIC"
+
+option		M68040		# support for 040
 option		FPSP		# MC68040 floating point support
-#option		"M68030"	# support for 030
-
-#option		MVME147		# (requires M68030)
-#option		MVME162		# (requires M68040)
-option		MVME167		# includes 166 (requires M68040)
-
-maxusers	6
-
-# obsolete timezone spec
-option		TIMEZONE=0, DST=0
-
-#option		DIAGNOSTIC, DEBUG
-option		DDB
-option		FFS
-option		NFSCLIENT
-option		NFSSERVER
-option		SYSVSEM,SYSVMSG,SYSVSHM
-option 		KTRACE
-option 		COMPAT_43
-option 		FIFO
-#option		MFS
-option		DEVPAGER, SWAPPAGER
-#option		MSDOSFS
 
-option		COMPAT_SUNOS
+option		MVME167		# includes 166 (requires M68040, FPSP)
 
-# Networking option
-option		INET
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-option		GATEWAY		# IP packet forwarding
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
+option		COMPAT_SUNOS
+option		COMPAT_HPUX
+option		COMPAT_M68K4K
 
-config		bsd	swap generic
+maxusers	32
 
-#pseudo-device	sl
-#pseudo-device	ppp 2
-pseudo-device	loop
-pseudo-device	bpfilter
-pseudo-device	pty
+config		bsd		swap generic
 
 mainbus0 at root
 
-# MVME147
-#pcc0	at mainbus0 addr 0xfffe0000
-#clock0	at pcc0 ipl 5
-#nvram0	at pcc0 offset 0x0000
-#zs0	at pcc0 offset 0x3000 ipl 4
-#zs1	at pcc0 offset 0x3800 ipl 4
-#le0	at pcc0 offset 0x1800 ipl 1
-#wdsc0	at pcc0 offset 0x4000 ipl 2
-##lp0	at pcc0 ipl 1
-#vme0	at pcc0 offset 0x2000
-
-# MVME162
-#mc0	at mainbus0 addr 0xfff00000
-#clock0	at mc0 ipl 5
-#nvram0	at mc0 offset 0xc0000
-#zs0	at mc0 offset 0x45000 ipl 4
-#zs1	at mc0 offset 0x45801 ipl 4
-#ie0	at mc0 offset 0x46000 ipl 1
-#ssh0	at mc0 offset 0x47000 ipl 2
-#memc0	at mc0 offset 0x43000
-#memc1	at mc0 offset 0x41000
-#ipic0	at mc0 offset 0xbc000
-#vme0	at mc0 offset 0x40000
-#flash0	at mainbus0 addr 0xffa00000
-#sram0	at mainbus0 addr 0xffe00000
-#fooip*	at ipic? manu 0x11 prod 0x22 ipl 1
-
 # MVME166/167/177
 pcctwo0 at mainbus0 addr 0xfff00000
 clock0	at pcctwo0 ipl 5
@@ -105,14 +49,18 @@ le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
 
 vmel0	at vme0
 
-#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
-#xdc0	at vmel0 addr 0xff00ee80 ipl 2 vec 0x44
-#xd*	at xdc? target ?
-
-#scsibus* at wdsc?
 scsibus* at ssh?
 scsibus* at vs?
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+ch*	at scsibus? target ? lun ?
+ss*	at scsibus? target ? lun ?
+uk*	at scsibus? target ? lun ?
+
+pseudo-device	rd 2
+
+#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
+#nxdc0	at vmes0 addr 0xff00ee80 ipl 2 vec 0x44
+#xd*	at xdc? target ?
diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177
index ea785a19548..593fe5a8ee4 100644
--- a/sys/arch/mvme68k/conf/MVME177
+++ b/sys/arch/mvme68k/conf/MVME177
@@ -1,21 +1,12 @@
-#	$OpenBSD: MVME177,v 1.7 2001/06/27 05:46:20 art Exp $
+#	$OpenBSD: MVME177,v 1.8 2001/08/03 21:16:04 miod Exp $
 
 machine		mvme68k m68k
 
 include "../../../conf/GENERIC"
 
-#option		M68030		# support for 030
-#option		M68040		# support for 040
 option		M68060		# support for 060
-
-option		FPSP		# MC68040 floating point support
 option		M060SP		# ...and MC68060 support package
-option		FPU_EMULATE	# FPU emulation
 
-#option		MVME147		# (requires M68030)
-#option		MVME162		# (requires M68040, FPSP)
-#option		MVME167		# includes 166 (requires M68040, FPSP)
-#option		MVME172		# (requires M68060, 060SP, FPSP)
 option		MVME177		# (requires M68060, 060SP, FPSP)
 
 option		COMPAT_SUNOS