update

6 files changed, 148 insertions, 352 deletions

diff --git a/sys/arch/hppa/conf/DISKLESS b/sys/arch/hppa/conf/DISKLESS
deleted file mode 100644
index c29a3d62bb7..00000000000
--- a/sys/arch/hppa/conf/DISKLESS
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: DISKLESS,v 1.6 1999/04/20 20:32:17 mickey Exp $
-#
-# Diskless kernel
-#
-
-include	"arch/hppa/conf/generic.hppa"
-maxusers	8
-
-option  GSCVERBOSE
-option  EISAVERBOSE
-#option PCIVERBOSE
-
-option	DISKLESS
-
-config	bsd root on nfs swap on nfs
-
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 2cbdf5b3f5b..787bb7d6671 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.13 2002/12/18 23:52:41 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.14 2002/12/19 00:24:40 mickey Exp $
 #
 # Diskless kernel config
 #
@@ -7,16 +7,6 @@ machine	hppa
 
 include "../../../conf/GENERIC"
 
-mainbus0 at root		# root "bus"
-
-mem*	at mainbus0		# /dev/*mem and memory controller
-pdc0	at mainbus0		# PDC/IODC wrapper for boot console
-cpu*	at mainbus0 irq 31	# HP PA-RISC cpu
-phantomas* at mainbus0		# Phantom PseudoBC GSC+ Port
-#fpu*	at mainbus0		# HP PA-RISC fpu (iv N/A)
-#pmu*	at mainbus0		# HP PA-RISC perfomance monitor unit (iv 29)
-#power*	at mainbus0		# power/fail manager (iv 2)
-
 # Support for various CPU types
 option	HP7000_CPU			# PCX
 option	HP7100_CPU,HP7150_CPU		# PCXS
@@ -26,21 +16,26 @@ option	HP7200_CPU,HP7250_CPU		# PCXT, PCXT'
 #option	HP8200_CPU			# PCXU2
 #option	HP8500_CPU			# PCXW
 
-option		PMAPDEBUG
-
-# Include all GENERIC options
-#include "arch/hppa/conf/generic.hppa"
+option		FPEMUL
+option		USELEDS		# blink 'em
 
 # Need to set locally
-maxusers	16
+maxusers	32
 
 option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight saving time used by RTC
 
 config	bsd root on nfs swap on nfs
 
-option		FPEMUL
-option		USELEDS		# blink 'em
+mainbus0 at root		# root "bus"
+
+mem*	at mainbus0		# /dev/*mem and memory controller
+pdc0	at mainbus0		# PDC/IODC wrapper for boot console
+cpu*	at mainbus0 irq 31	# HP PA-RISC cpu
+phantomas0 at mainbus0		# Phantom PseudoBC GSC+ Port
+#fpu*	at mainbus0		# HP PA-RISC fpu (iv N/A)
+#pmu*	at mainbus0		# HP PA-RISC perfomance monitor unit (iv 29)
+#power*	at mainbus0		# power/fail manager (iv 2)
 
 lasi0	at mainbus0 offset 0x100000 irq 28	# LASI host adapter (LSI PN???)
 lasi0	at mainbus0 offset 0xfd00000 irq 28	# LASI on J210
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 40001411f4d..f34eaad0fd7 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,21 +1,143 @@
-#	$OpenBSD: RAMDISK,v 1.4 2002/09/20 19:29:00 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.5 2002/12/19 00:24:40 mickey Exp $
 #
-# Generic kernel config (all that is supportted)
+# Diskless kernel config
 #
 
-include	"arch/hppa/conf/generic.hppa"
-maxusers	8
+machine	hppa
 
-option  GSCVERBOSE
-option  EISAVERBOSE
-#option PCIVERBOSE
+include "../../../conf/GENERIC"
 
-option	RAMDISK_HOOKS
-option	MINIROOTSIZE=4096
+# Support for various CPU types
+option	HP7000_CPU			# PCX
+option	HP7100_CPU,HP7150_CPU		# PCXS
+option	HP7100LC_CPU,HP7300LC_CPU	# PCXL, PCXL2
+option	HP7200_CPU,HP7250_CPU		# PCXT, PCXT'
+#option	HP8000_CPU			# PCXU
+#option	HP8200_CPU			# PCXU2
+#option	HP8500_CPU			# PCXW
 
-config	bsd root on rd0a swap on rd0b
+option		FPEMUL
+option		USELEDS		# blink 'em
 
-pseudo-device	rd	2
+# Need to set locally
+maxusers	32
 
-sd*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight saving time used by RTC
+
+option		RAMDISK_HOOKS
+option		MINIROOTSIZE=4096
+config	bsd	root on rd0a swap on rd0b # and sd0b
+
+mainbus0 at root		# root "bus"
+
+mem*	at mainbus0		# /dev/*mem and memory controller
+pdc0	at mainbus0		# PDC/IODC wrapper for boot console
+cpu*	at mainbus0 irq 31	# HP PA-RISC cpu
+phantomas0 at mainbus0		# Phantom PseudoBC GSC+ Port
+#fpu*	at mainbus0		# HP PA-RISC fpu (iv N/A)
+#pmu*	at mainbus0		# HP PA-RISC perfomance monitor unit (iv 29)
+#power*	at mainbus0		# power/fail manager (iv 2)
+
+lasi0	at mainbus0 offset 0x100000 irq 28	# LASI host adapter (LSI PN???)
+lasi0	at mainbus0 offset 0xfd00000 irq 28	# LASI on J210
+lasi0	at phantomas0 offset 0xfd00000 irq 28	# LASI on [ABC]*
+lasi1	at mainbus0 offset 0x500000 irq 27	# GIO card
+asp*	at mainbus0 irq 28	# this one comes w/ Viper and leds
+#wax*	at mainbus0 irq 24	# Wax may host EISA as well
+mongoose* at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
+#vmeb*	at mainbus0 irq ?	# VME bus adapter
+#dino*	at mainbus0 irq ?	# PCI bus bridge
+
+sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
+sti1	at mainbus0 irq 12
+
+# internal i/o space
+gsc0	at asp?			# 7xx
+gsc0	at lasi0		# 712,715/100,725/75,725/100
+gsc1	at lasi1
+#gsc2	at wax?			# it's another face of LASI
+
+#vme*	at vmeb?
+#option	VMEVERBOSE
+#pci*	at dino?
+#option	PCIVERBOSE
+eisa*	at mongoose?
+#eisa*	at wax?
+option	EISAVERBOSE
+#isa*	at mongoose?
+#isa*	at wax?
+
+# GSC devices
+
+#hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
+#hkbd*	at hil? code 0	# keyboard
+#hilnmi0 at hil? irq 2	# double-break on hil keyboard
+#tb*	at hil? code 1	# graphics tablet
+#hms*	at hil? code 2	# mouse, 3b mouse, 3b trackball, 3b quadrature mouse
+#knob*	at hil? code 3	# knob
+#bbox*	at hil? code 4	# 32 button box
+#dizer*	at hil? code 5	# A & B size digitizers
+#crsr*	at hil? code 6	# cursor for digitizer
+#qbox*	at hil? code 7	# quadrature
+
+#medusa* at gsc? irq 4	# FDDI
+
+# RS/232 serial ports
+com0	at gsc0 offset 0x5000 irq 5	# on lasi
+com1	at gsc1 offset 0x5000 irq 5
+com0	at gsc0 offset 0x23000 irq 5	# on asp
+com1	at gsc0 offset 0x22000 irq 6
+com2	at gsc0 offset 0x0 irq 13	# only on asp0 w/o audio (off ?)
+
+lpt0	at gsc? irq 7	# both com and lpt are on WD16C552
+ie0	at gsc0 irq 8	# 82C5[89]6 ether
+ie1	at gsc1 irq 8
+#tms*	at gsc? irq 10	# TMS380C26 Network Controller (either 802.3 or 802.5)
+#siop0	at gsc? irq 9	# NCR 53C700/710
+#siop1	at gsc? irq 3	# NCR 53C720 (Fast/Wide)
+#scsibus* at siop?
+#aone*	at gsc? irq 13	# Audio Type 1 (PSB 2160-N)
+#audio*	at aone?
+#harmony* at gsc? irq 13	# Audio Type 2 (CS4215/AD1849)
+#audio*	at harmony?
+#pckbc*	at gsc? irq 26
+#pckbd*	at pckbc?	# PS/2 keyboard
+#pms*	at pckbc?	# PS/2 mouse
+#fdc*	at gsc?		# PC floppy controller (WD37C65C)
+#option	FD_DEBUG
+
+# EISA devices
+#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
+#ep*	at eisa? slot ?
+#ie*	at eisa? slot ?
+#option	BHADEBUG
+#bha*	at eisa? slot ?
+#scsibus* at bha?
+
+# ISA devices
+#vga*	at isa?
+#fdc*	at isa? port 0x3f0 irq 6 drq 2
+#wdc0	at isa? port 0x1f0 irq 14
+#wdc1	at isa? port 0x170 irq 15
+#ie*	at isa? port 0x360 iomem 0xd0000 irq 7
+#ie*	at isa? port 0x300 irq 10
+
+# MI devices
+#wsdisplay*	at vgafb?
+#wsdisplay*	at sti?
+#wskbd*		at pckbd?
+#wskbd*		at hkbd?
+#wsmouse*	at pms?
+#wsmouse*	at hms?
+
+#fd*	at fdc?	drive ?	# floppy drives
+
+#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	1	# ramdisk
diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE
deleted file mode 100644
index 34ab1f853fc..00000000000
--- a/sys/arch/hppa/conf/SHEPHERD_PIE
+++ /dev/null
@@ -1,173 +0,0 @@
-#	$OpenBSD: SHEPHERD_PIE,v 1.20 2002/12/13 10:23:47 miod Exp $
-#
-# Diskless kernel config
-#
-
-include	"arch/hppa/conf/std.hppa"
-
-#option	MALLOC_DEBUG
-#option	SYSCALL_DEBUG
-
-# Support for various CPU types
-option	HP7000_CPU			# PCX
-option	HP7100_CPU,HP7150_CPU		# PCXS
-option	HP7100LC_CPU,HP7300LC_CPU	# PCXL, PCXL2
-option	HP7200_CPU,HP7250_CPU		# PCXT, PCXT'
-#option	HP8000_CPU			# PCXU
-#option	HP8200_CPU			# PCXU2
-#option	HP8500_CPU			# PCXW
-
-option		DDB		# in-kernel debugger
-#makeoptions	DEBUG="-g"	# compile full symbol table
-option		DIAGNOSTIC	# internal consistency checks
-option		DEBUG		# internal debug checks
-option		KTRACE
-option		PTRACE
-option		KMEMSTATS
-
-option		PMAPDEBUG
-
-option		COMPAT_43	# Compatibility with 4.3BSD
-
-#option		LKM		# loadable kernel modules
-
-#option		DISKLESS
-option		FFS		# unfortunately this is required...
-option		MFS		# memory file system
-option		FIFO		# FIFOs; RECOMMENDED
-option		INET		# IP + ICMP + TCP + UDP
-option		NFSCLIENT	# Network File System client
-
-pseudo-device	loop	2	# network loopback
-pseudo-device	bpfilter 8	# packet filter
-
-pseudo-device	pty	64	# pseudo-terminals
-pseudo-device	ksyms
-
-option		BOOT_CONFIG	# add support for boot -c
-
-# Include all GENERIC options
-#include "arch/hppa/conf/generic.hppa"
-
-# Need to set locally
-maxusers	8
-
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight saving time used by RTC
-
-#option	 	COMPAT_HPUX	# HP-UX binary compatibility
-
-#option  RAMDISK_HOOKS
-#option  MINIROOTSIZE=8192
-
-#config	bsd root on rd0 swap on rd0	# temp until ie0 is stable
-config	bsd root on nfs swap on nfs
-
-pseudo-device	rd	2	# RAM disk device
-
-# the rest will be removed
-
-option		FPEMUL
-option		USELEDS		# blink 'em
-
-lasi0	at mainbus0 offset 0x100000 irq 28	# LASI host adapter (LSI PN???)
-lasi0	at mainbus0 offset 0xfd00000 irq 28	# LASI on J210
-lasi1	at mainbus0 offset 0x500000 irq 27	# GIO card
-asp*	at mainbus0 irq 28	# this one comes w/ Viper and leds
-#wax*	at mainbus0 irq 24	# Wax may host EISA as well
-mongoose* at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
-#vmeb*	at mainbus0 irq ?	# VME bus adapter
-#dino*	at mainbus0 irq ?	# PCI bus bridge
-
-sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
-sti1	at mainbus0 irq 12
-
-# internal i/o space
-gsc0	at asp?			# 7xx
-gsc0	at lasi0		# 712,715/100,725/75,725/100
-gsc1	at lasi1
-#gsc2	at wax?			# it's another face of LASI
-
-#vme*	at vmeb?
-#option	VMEVERBOSE
-#pci*	at dino?
-#option	PCIVERBOSE
-eisa*	at mongoose?
-#eisa*	at wax?
-option	EISAVERBOSE
-#isa*	at mongoose?
-#isa*	at wax?
-
-# GSC devices
-
-#hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
-#hkbd*	at hil? code 0	# keyboard
-#hilnmi0 at hil? irq 2	# double-break on hil keyboard
-#tb*	at hil? code 1	# graphics tablet
-#hms*	at hil? code 2	# mouse, 3b mouse, 3b trackball, 3b quadrature mouse
-#knob*	at hil? code 3	# knob
-#bbox*	at hil? code 4	# 32 button box
-#dizer*	at hil? code 5	# A & B size digitizers
-#crsr*	at hil? code 6	# cursor for digitizer
-#qbox*	at hil? code 7	# quadrature
-
-#medusa* at gsc? irq 4	# FDDI
-
-# RS/232 serial ports
-com0	at gsc0 offset 0x5000 irq 5	# on lasi
-com1	at gsc1 offset 0x5000 irq 5
-com0	at gsc0 offset 0x23000 irq 5	# on asp
-com1	at gsc0 offset 0x22000 irq 6
-com2	at gsc0 offset 0x0 irq 13	# only on asp0 w/o audio (off ?)
-
-lpt0	at gsc? irq 7	# both com and lpt are on WD16C552
-ie0	at gsc0 irq 8	# 82C5[89]6 ether
-ie1	at gsc1 irq 8
-#tms*	at gsc? irq 10	# TMS380C26 Network Controller (either 802.3 or 802.5)
-#siop0	at gsc? irq 9	# NCR 53C700/710
-#siop1	at gsc? irq 3	# NCR 53C720 (Fast/Wide)
-#scsibus* at siop?
-#aone*	at gsc? irq 13	# Audio Type 1 (PSB 2160-N)
-#audio*	at aone?
-#harmony* at gsc? irq 13	# Audio Type 2 (CS4215/AD1849)
-#audio*	at harmony?
-#pckbc*	at gsc? irq 26
-#pckbd*	at pckbc?	# PS/2 keyboard
-#pms*	at pckbc?	# PS/2 mouse
-#fdc*	at gsc?		# PC floppy controller (WD37C65C)
-#option	FD_DEBUG
-
-# EISA devices
-#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
-#ep*	at eisa? slot ?
-#ie*	at eisa? slot ?
-#option	BHADEBUG
-#bha*	at eisa? slot ?
-#scsibus* at bha?
-
-# ISA devices
-#vga*	at isa?
-#fdc*	at isa? port 0x3f0 irq 6 drq 2
-#wdc0	at isa? port 0x1f0 irq 14
-#wdc1	at isa? port 0x170 irq 15
-#ie*	at isa? port 0x360 iomem 0xd0000 irq 7
-#ie*	at isa? port 0x300 irq 10
-
-# MI devices
-option	WSEMUL_VT100
-#wsdisplay*	at vgafb?
-#wsdisplay*	at sti?
-#wskbd*		at pckbd?
-#wskbd*		at hkbd?
-#wsmouse*	at pms?
-#wsmouse*	at hms?
-
-#fd*	at fdc?	drive ?	# floppy drives
-
-#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 ?
-
diff --git a/sys/arch/hppa/conf/generic.hppa b/sys/arch/hppa/conf/generic.hppa
deleted file mode 100644
index 6e7955d7c6b..00000000000
--- a/sys/arch/hppa/conf/generic.hppa
+++ /dev/null
@@ -1,116 +0,0 @@
-#	$OpenBSD: generic.hppa,v 1.7 2002/12/13 10:23:47 miod Exp $
-#
-# Generic kernel config (all that is supportted)
-#
-
-include	"arch/hppa/conf/std.hppa"
-include "conf/GENERIC"
-
-# Support for various CPU types
-option	HP7000_CPU		# PCX
-option	HP7100_CPU,HP7150_CPU	# PCX-S
-option	HP7200_CPU,HP7250_CPU	# PCX-T, PCX-T'
-option	HP7100LC_CPU		# PCX-L
-option	HP7300LC_CPU		# PCX-L2
-#option	HP8000_CPU		# PCX-U  (in 32bit mode)
-#option	HP8200_CPU		# PCX-U+ (in 32bit mode)
-#option	HP8500_CPU		# PCX-W  (in 32bit mode)
-
-option		FPEMUL
-option		USELEDS		# blink 'em
-
-#option	 	COMPAT_HPUX	# HP-UX binary compatibility
-#option	 	COMPAT_OSF1	# OSF1 binary compatibility
-#option	 	COMPAT_LINUX	# MkLinux binary compatibility
-
-lasi*	at mainbus0 irq 28	# LASI host adapter (LSI PN???)
-asp*	at mainbus0 irq 28	# this one comes w/ Viper and leds
-#wax*	at mainbus0 irq 24	# Wax may host EISA as well
-mongoose* at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
-#vmeb*	at mainbus0 irq ?	# VME bus adapter
-#dino*	at mainbus0 irq ?	# PCI bus bridge
-
-sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
-sti1	at mainbus0 irq 12
-
-# internal i/o space
-gsc*	at lasi?		# 712,715/64/80/100
-gsc*	at asp?			# 7xx/33/50/75 (old)
-#gsc*	at wax?			# {725,715}/{64,80,100}, C*, B*, J*
-
-#vme*	at vmeb?
-#pci*	at dino?
-eisa*	at mongoose?
-#eisa*	at wax?
-#isa*	at mongoose?
-#isa*	at wax?
-
-# GSC devices
-
-hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
-#hkbd*	at hil? code 0	# keyboard
-#hms*	at hil? code 1	# mouse, 3b mouse, 3b trackball, 3b quadrature mouse
-
-#medusa* at gsc? irq 4	# FDDI
-com0	at gsc? irq 5	# RS/232 serial port
-com1	at gsc? irq 6	# RS/232 serial port
-com2	at gsc? irq 13	# only on asp0 w/o harmony
-lpt0	at gsc? irq 7	# both com and lpt are on WD16C552 or LASI
-ie0	at gsc? irq 8	# 82C5[89]6 ether
-siop0	at gsc? irq 9	# NCR 53C7xx
-siop1	at gsc? irq 3	# NCR 53C7xx (Fast/Wide)
-scsibus* at siop?
-#aone*	at gsc? irq 13	# Audio Type 1 (PSB 2160-N)
-#audio* at aone?
-#harmony*	at harmony?	irq 13	# Audio Type 2 (CS4215)
-#audio* at harmony?
-#fdc*	at gsc? irq 20	# PC floppy controller (WD37C65C)
-#option	FD_DEBUG
-pckbc*	at gsc? irq 26
-pckbd*	at pckbc?	# PS/2 keyboard
-pms*	at pckbc?	# PS/2 mouse
-
-# EISA devices
-#vga*	at eisa? slot ?
-#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
-#ie*	at eisa? slot ?
-ep*	at eisa? slot ?
-bha*	at eisa? slot ?
-scsibus* at bha?
-
-# ISA devices
-#com*	at isa? port 0x3f8 irq 4
-#com*	at isa? port 0x2f8 irq 3
-#com*	at isa? port 0x3e8 irq 5
-#com*	at isa? port 0x2e8 irq 9
-#lpt*	at isa? port 0x378 irq 7
-#lpt*	at isa? port 0x278
-#lpt*	at isa? port 0x3bc
-#fdc*	at isa? port 0x3f0 irq 6 drq 2
-#wdc0	at isa? port 0x1f0 irq 14
-#wdc1	at isa? port 0x170 irq 15
-#ie*	at isa? port 0x360 iomem 0xd0000 irq 7
-#ie*	at isa? port 0x300 irq 10
-#vga*	at isa?
-
-# PCI devices
-#myri*	at pci? dev ? function ?	# ANSI/VITA-26-1998 Gbit iface
-#ie*	at pci? dev ? function ?
-
-# MI devices
-option	WSEMUL_DUMB
-#wsdisplay*	at vgafb?
-#wsdisplay*	at sti?
-wskbd*		at pckbd?
-#wskbd*		at hkbd?
-wsmouse*	at pms?
-#wsmouse*	at hms?
-
-#fd*	at fdc?	drive ?	# floppy drives
-
-st*	at scsibus? target ? lun ?
-ch*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-ss*	at scsibus? target ? lun ?
-uk*	at scsibus? target ? lun ?
-
diff --git a/sys/arch/hppa/conf/std.hppa b/sys/arch/hppa/conf/std.hppa
deleted file mode 100644
index 77499811539..00000000000
--- a/sys/arch/hppa/conf/std.hppa
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: std.hppa,v 1.4 2001/06/27 05:46:13 art Exp $
-#
-# Standard devices present on every hppa workstation
-#
-
-machine	hppa
-
-mainbus0 at root		# root "bus"
-
-mem*	at mainbus0		# /dev/*mem and memory controller
-pdc0	at mainbus0		# PDC/IODC wrapper for boot console
-cpu*	at mainbus0 irq 31	# HP PA-RISC cpu
-#fpu*	at mainbus0		# HP PA-RISC fpu (iv N/A)
-#pmu*	at mainbus0		# HP PA-RISC perfomance monitor unit (iv 29)
-#power*	at mainbus0		# power/fail manager (iv 2)
-