remove HZ and NKMEMCLUSTER and add offset? to the at ioasic? entries

8 files changed, 26 insertions, 49 deletions

diff --git a/sys/arch/pmax/conf/DS3100 b/sys/arch/pmax/conf/DS3100
index 3f3108cb9ff..cfe73a65038 100644
--- a/sys/arch/pmax/conf/DS3100
+++ b/sys/arch/pmax/conf/DS3100
@@ -9,9 +9,6 @@ option		CPU_R3000		# R2000/R3000 support
 option		MIPS1			# R2000/R3000 support
 # support for specific models of decstation
 option	 	DS3100			# PMAX (kn01) decstation 2100, 3100
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
diff --git a/sys/arch/pmax/conf/DS5000_100 b/sys/arch/pmax/conf/DS5000_100
index 2a700c31b87..667917d3313 100644
--- a/sys/arch/pmax/conf/DS5000_100
+++ b/sys/arch/pmax/conf/DS5000_100
@@ -9,9 +9,6 @@ option		CPU_R3000		# R2000/R3000 support
 option		MIPS1			# R2000/R3000 support
 # support for specific models of decstation
 option	 	DS5000_100		# 3MIN (kn02ba/kmin)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
@@ -84,11 +81,11 @@ sfb0		at tc?
 le*		at tc?			# other lance network interfaces
 # ioasic standard baseboard options (5000/2x, 5000/1xx, 5000/2[46]0)
 ioasic0         at tc?
-clock0          at ioasic?		# rtc
-asc0            at ioasic?		# system scsi subslot
-scc0		at ioasic?
-le0		at ioasic?		# tc onboard lance
-scc1		at ioasic?		# not present on maxine
+clock0          at ioasic? offset?	# rtc
+asc0            at ioasic? offset?	# system scsi subslot
+scc0		at ioasic? offset?
+le0		at ioasic? offset?	# tc onboard lance
+scc1		at ioasic? offset?	# not present on maxine
 # the scsi busses
 oldscsibus*	at asc?
 # scsi configuration for old 4.4bsd/pmax decstation scsi driver
diff --git a/sys/arch/pmax/conf/DS5000_200 b/sys/arch/pmax/conf/DS5000_200
index dd75838e59c..b4f06846c3a 100644
--- a/sys/arch/pmax/conf/DS5000_200
+++ b/sys/arch/pmax/conf/DS5000_200
@@ -9,9 +9,6 @@ option		CPU_R3000		# R2000/R3000 support
 option		MIPS1			# R2000/R3000 support
 # support for specific models of decstation
 option	 	DS5000_200		# 3MAX (kn02)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
diff --git a/sys/arch/pmax/conf/DS5000_240 b/sys/arch/pmax/conf/DS5000_240
index e1ce381fd66..4c70593538d 100644
--- a/sys/arch/pmax/conf/DS5000_240
+++ b/sys/arch/pmax/conf/DS5000_240
@@ -9,9 +9,6 @@ option		CPU_R3000		# R2000/R3000 support
 option		MIPS1			# R2000/R3000 support
 # support for specific models of decstation
 option	 	DS5000_240		# 3MAXPLUS (kn03)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
@@ -89,7 +86,7 @@ dc0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic?		# dc7083 four-port dz device
+dc0		at ioasic? offset?	# dc7083 four-port dz device
 # the scsi busses
 oldscsibus*	at asc?
 # scsi configuration for old 4.4bsd/pmax decstation scsi driver
diff --git a/sys/arch/pmax/conf/DS5000_25 b/sys/arch/pmax/conf/DS5000_25
index 86747c32198..bc1395c5fac 100644
--- a/sys/arch/pmax/conf/DS5000_25
+++ b/sys/arch/pmax/conf/DS5000_25
@@ -9,9 +9,6 @@ option		CPU_R3000		# R2000/R3000 support
 option		MIPS1			# R2000/R3000 support
 # support for specific models of decstation
 option	 	DS5000_25		# MAXINE (kn02ca/xine)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
@@ -85,14 +82,14 @@ le0		at tc?			# decstation 5000/200 baseboard
 le*		at tc?			# other lance network interfaces
 # ioasic standard baseboard options (5000/2x, 5000/1xx, 5000/2[46]0)
 ioasic0         at tc?
-clock0          at ioasic?		# rtc
-asc0            at ioasic?		# system scsi subslot
-scc0		at ioasic?
-le0		at ioasic?		# tc onboard lance
-scc1		at ioasic?		# not present on maxine
+clock0          at ioasic? offset?	# rtc
+asc0            at ioasic? offset?	# system scsi subslot
+scc0		at ioasic? offset?
+le0		at ioasic? offset?	# tc onboard lance
+scc1		at ioasic? offset?	# not present on maxine
 # MAXINE-only ioasic baseboard devices and on-baseboard "options"
 xcfb0		at tc?			# tc framebuffer "option"
-dtop0		at ioasic0		# destop bus,  lk501 kbd,  mouse
+dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # the scsi busses
 oldscsibus*	at asc?
 # scsi configuration for old 4.4bsd/pmax decstation scsi driver
diff --git a/sys/arch/pmax/conf/GENERIC.NFS b/sys/arch/pmax/conf/GENERIC.NFS
index c29e0b56285..705ca031984 100644
--- a/sys/arch/pmax/conf/GENERIC.NFS
+++ b/sys/arch/pmax/conf/GENERIC.NFS
@@ -13,9 +13,6 @@ option	 	DS5000_25		# MAXINE (kn02ca/xine)
 option	 	DS5000_100		# 3MIN (kn02ba/kmin)
 option	 	DS5000_200		# 3MAX (kn02)
 option	 	DS5000_240		# 3MAXPLUS (kn03)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
@@ -90,21 +87,21 @@ le0		at tc?			# decstation 5000/200 baseboard
 le*		at tc?			# other lance network interfaces
 # ioasic standard baseboard options (5000/2x, 5000/1xx, 5000/2[46]0)
 ioasic0         at tc?
-clock0          at ioasic?		# rtc
-asc0            at ioasic?		# system scsi subslot
-scc0		at ioasic?
-le0		at ioasic?		# tc onboard lance
-scc1		at ioasic?		# not present on maxine
+clock0          at ioasic? offset?	# rtc
+asc0            at ioasic? offset?	# system scsi subslot
+scc0		at ioasic? offset?
+le0		at ioasic? offset?	# tc onboard lance
+scc1		at ioasic? offset?	# not present on maxine
 # MAXINE-only ioasic baseboard devices and on-baseboard "options"
 xcfb0		at tc?			# tc framebuffer "option"
-dtop0		at ioasic0		# destop bus,  lk501 kbd,  mouse
+dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
 dc0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic?		# dc7083 four-port dz device
+dc0		at ioasic? offset?	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
diff --git a/sys/arch/pmax/conf/GENERIC.rz0 b/sys/arch/pmax/conf/GENERIC.rz0
index 875c1a11804..9e7ff2111f2 100644
--- a/sys/arch/pmax/conf/GENERIC.rz0
+++ b/sys/arch/pmax/conf/GENERIC.rz0
@@ -14,9 +14,6 @@ option	 	DS5000_25		# MAXINE (kn02ca/xine)
 option	 	DS5000_100		# 3MIN (kn02ba/kmin)
 option	 	DS5000_200		# 3MAX (kn02)
 option	 	DS5000_240		# 3MAXPLUS (kn03)
-# pmax specific
-option		"HZ=256"		# rtc rate required
-option		"NKMEMCLUSTERS=1024"	# 4k pages in kernel malloc pool
 # timezone stuff
 option		TIMEZONE=0
 option		DST=0			# use daylight savings rules
@@ -91,21 +88,21 @@ le0		at tc?			# decstation 5000/200 baseboard
 le*		at tc?			# other lance network interfaces
 # ioasic standard baseboard options (5000/2x, 5000/1xx, 5000/2[46]0)
 ioasic0         at tc?
-clock0          at ioasic?		# rtc
-asc0            at ioasic?		# system scsi subslot
-scc0		at ioasic?
-le0		at ioasic?		# tc onboard lance
-scc1		at ioasic?		# not present on maxine
+clock0          at ioasic? offset?	# rtc
+asc0            at ioasic? offset?	# system scsi subslot
+scc0		at ioasic? offset?
+le0		at ioasic? offset?	# tc onboard lance
+scc1		at ioasic? offset?	# not present on maxine
 # MAXINE-only ioasic baseboard devices and on-baseboard "options"
 xcfb0		at tc?			# tc framebuffer "option"
-dtop0		at ioasic0		# destop bus,  lk501 kbd,  mouse
+dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
 dc0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic?		# dc7083 four-port dz device
+dc0		at ioasic? offset?	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
diff --git a/sys/arch/pmax/conf/PLUTO b/sys/arch/pmax/conf/PLUTO
index 528fe01d04c..1c41cfa5d6f 100644
--- a/sys/arch/pmax/conf/PLUTO
+++ b/sys/arch/pmax/conf/PLUTO
@@ -7,8 +7,6 @@ machine		pmax
 option		CPU_R3000
 option		MIPS1
 option		DS3100
-option		HZ=256
-option		NKMEMCLUSTERS=1024
 option		TIMEZONE=0
 option		DST=0