factor out common devices/options

8 files changed, 338 insertions, 459 deletions

diff --git a/sys/arch/hppa/conf/DISKLESS b/sys/arch/hppa/conf/DISKLESS
index a9e121cac05..c29a3d62bb7 100644
--- a/sys/arch/hppa/conf/DISKLESS
+++ b/sys/arch/hppa/conf/DISKLESS
@@ -1,212 +1,16 @@
-#	$OpenBSD: DISKLESS,v 1.5 1999/02/25 16:59:24 mickey Exp $
+#	$OpenBSD: DISKLESS,v 1.6 1999/04/20 20:32:17 mickey Exp $
 #
-# Diskless kernel config
+# Diskless kernel
 #
 
-#source	/sys
-#build	/usr/obj/sys/arch/hppa/compile/DISKLESS
-
-machine hppa
-
-# Support for various CPU types
-option	HP7100
-option	HP7150
-option	HP7100LC
-option	HP7200
-option	HP7250
-#option	HP7300
-#option	HP8000
-#option	HP8200
-#option	HP8500
-
-option		FPEMUL
-option		USELEDS		# blink 'em
-
-#option		INSECURE	# default to secure
-
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight savings time used by RTC
-#option		NTP		# hooks supporting the Network Time Protocol
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-option		DDB		# in-kernel debugger
-#makeoptions	DEBUG="-g"	# compile full symbol table
-option		DIAGNOSTIC	# internal consistency checks
-option		DEBUG		# internal debug checks
-option		PMAPDEBUG
-#option		KTRACE		# system call tracing, a la ktrace(1)
-
-#option		SYSVMSG		# System V-like message queues
-#option		SYSVSEM		# System V-like semaphores
-#option		SYSVSHM		# System V-like memory sharing
-#option		SHMMAXPGS=1024	# 1024 pages is the default
-
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
-#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-#option		LKM		# loadable kernel modules
-
-option		DISKLESS
-option		FFS		# UFS
-#option		QUOTA		# UFS quotas
-#option		LFS		# log-structured file system
-#option		EXT2FS		# Second Extended Filesystem
-#option		MFS		# memory file system
-
-
-option		NFSCLIENT	# Network File System client
-#option		NFSSERVER	# Network File System server
-
-#option		CD9660		# ISO 9660 + Rock Ridge file system
-#option		MSDOSFS		# MS-DOS file system
-#option		FDESC		# /dev/fd
-option		FIFO		# FIFOs; RECOMMENDED
-#option		KERNFS		# /kern
-#option		NULLFS		# loopback file system
-#option		PORTAL		# dynamically created filesystem objects
-#option		PROCFS		# /proc
-#option		UMAPFS		# NULLFS + uid and gid remapping
-#option		UNION		# union file system
-
-#option		GATEWAY		# packet forwarding
-option		INET		# IP + ICMP + TCP + UDP
-#option		IPSEC		# IPsec
-#option		NS		# XNS
-#option		NSIP		# XNS tunneling over IP
-#option		IPX		# IPX+SPX
-#option		IPXIP		# IPX tunneling over IP
-#option		ISO,TPIP	# OSI
-#option		EON		# OSI tunneling over IP
-#option		CCITT,LLC,HDLC	# X.25
-#option		IPFILTER	# IP packet filter for security
-#option		IPFILTER_LOG	# use /dev/ipl to log IPF
-#option		PPP_BSDCOMP	# PPP BSD compression
-#option		PPP_DEFLATE
-
-pseudo-device	loop	2	# network loopback
-pseudo-device	bpfilter 8	# packet filter
-#pseudo-device	sl	2	# CSLIP
-#pseudo-device	ppp	2	# PPP
-#pseudo-device	tun	2	# network tunneling over tty
-#pseudo-device	enc	1	# encryption device
-#pseudo-device	strip	1	# Starmode Radio IP interface
-
-#pseudo-device	pty	64	# pseudo-terminals
-#pseudo-device	tb	1	# tablet line discipline
-#pseudo-device	vnd	4	# paging to files
-#pseudo-device	ccd	4	# concatenated disk devices
-
-option		BOOT_CONFIG	# add support for boot -c
-
-# Include all GENERIC options
-#include "/sys/conf/GENERIC"
-
-# Need to set locally
+include	"arch/hppa/conf/generic.hppa"
 maxusers	8
 
-#option	 	COMPAT_HPUX	# HP-UX binary compatibility
-
-config	bsd root on nfs swap on nfs
-
-mainbus0	at root		# root "bus"
-
-mem*	at mainbus0
-cpu*	at mainbus0
-pdc0	at mainbus0
-
-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 28	# Wax may host EISA as well
-eba*	at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
-#vmeb*	at mainbus0 irq ?	# VME bus adapter
-#dino*	at mainbus0 irq ?	# PCI bus adapter
-
-#sti*	at mainbus0 irq ?	# [H]CRX-{8,24,48}[Z] graphics
-
-# internal i/o space
-gsc*	at lasi?		# 712,715/100,725/75,725/100
-gsc*	at asp?			# 7xx
-#gsc*	at wax?			# 715?
-
-#vme*	at vmeb?
-#pci*	at dino?
-eisa*	at eba?
-#eisa*	at wax?
-option	EISA_VERBOSE
-#isa*	at eba?
-#isa*	at wax?
+option  GSCVERBOSE
+option  EISAVERBOSE
+#option PCIVERBOSE
 
-# GSC devices
+option	DISKLESS
 
-hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
-#hkbd*	at hil? code 0	# keyboard
-#hilnmi0 at kbd? 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
-com0	at gsc? irq 5	# RS/232 serial port
-com1	at gsc? irq 6	# RS/232 serial port
-lpt0	at gsc? irq 7	# LPT centronics iface
-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?
-#atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
-#audio* at atwo?
-pckbc*	at gsc? irq 27
-pckbd*	at pckbc?	# PS/2 keyboard
-#pms*	at pckbc?	# PS/2 mouse
-fdc*	at gsc?		# PC floppy controller (WD37C65C)
-option	FD_DEBUG
-
-# EISA devices
-#vga*	at eisa? slot ?
-#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
-ep*	at eisa? slot ?
-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
-
-# PCI devices
-#myri*	at pci? dev ? function ?	# ANSI/VITA-26-1998 Gbit iface
-
-# 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
-
-#atapibus* at wdc?
-#wd*	at wdc? drive ?
-#acd*	at atapibus? drive ?
-
-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 ?
+config	bsd root on nfs swap on nfs
 
diff --git a/sys/arch/hppa/conf/GECKO b/sys/arch/hppa/conf/GECKO
index 874dab1ed42..2510a64d429 100644
--- a/sys/arch/hppa/conf/GECKO
+++ b/sys/arch/hppa/conf/GECKO
@@ -1,16 +1,15 @@
-#	$OpenBSD: GECKO,v 1.5 1999/03/04 23:26:13 mickey Exp $
+#	$OpenBSD: GECKO,v 1.6 1999/04/20 20:32:18 mickey Exp $
 #
 # HP 9000/712/{60,80,80i,100} boxens
 #
-# neverseen devices: telephony, X.21 m-proto adapter, TR/9000
+# neverseen devices: telephony, X.21 m-proto adapter, TR/9000, IEEE488
 
-machine hppa
-
-include	"../../../conf/GENERIC"
+include	"arch/hppa/conf/std.hppa"
+include	"conf/GENERIC"
 
 maxusers	16
 
-option		HP7100LC
+option		HP7100LC_CPU
 #option		FPEMUL		# has FPU onboard
 
 #option		NS		# XNS
@@ -22,16 +21,11 @@ option		HP7100LC
 #option		CCITT,LLC,HDLC	# X.25
 
 #option	 	COMPAT_HPUX	# HP-UX binary compatibility
+#option		COMPAT_LINUX	# MkLinux/Linux binary compatibility
 #option		COMPAT_OSF1	# OSF1 binary compatibility
-#option		COMPAT_LINUX	# Mach/Linux binary compatibility
 
 config	bsd swap generic
 
-mainbus0	at root		# root "bus"
-
-mem0	at mainbus0		# /dev/*mem, and memory controller
-pdc0	at mainbus0		# PDC/IODC wrapper for boot console
-cpu0	at mainbus0 #irq 31	# HP PA7100LC processor
 lasi0	at mainbus0 irq 28	# LASI host adapter (LSI ???)
 #lasi1	at mainbus0 irq ?	# LASI host adapter in the GIO slot
 sti0	at mainbus0 		# onboard HCRX-8 graphics
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 54fd19298e3..f61bce0b638 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,125 +1,21 @@
-#	$OpenBSD: GENERIC,v 1.6 1999/03/04 23:26:14 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.7 1999/04/20 20:32:18 mickey Exp $
 #
 # Generic kernel config (all that is supportted)
 #
 
-machine	hppa
-
-include "/sys/conf/GENERIC"
+include	"arch/hppa/conf/generic.hppa"
 maxusers	8
 
-# Support for various CPU types
-option	HP7000		# PCX-S
-option	HP7100
-option	HP7150		# PCX-T
-option	HP7100LC	# PCX-L
-option	HP7200
-option	HP7250		# PCX-T*
-#option	HP7300LC	# PCX-L2
-#option	HP8000		# PCX-U  (in 32bit mode)
-#option	HP8200		# PCX-U+ (in 32bit mode)
-#option	HP8500		# PCX-W  (in 32bit mode)
-
-option		FPEMUL
-option		USELEDS		# blink w/ 'em
-
-#option	 	COMPAT_HPUX	# HP-UX binary compatibility
-#option	 	COMPAT_OSF1	# OSF1 binary compatibility
-#option	 	COMPAT_LINUX	# MkLinux binary compatibility
-
-option	GSCVERBOSE
-option	EISAVERBOSE
-#option	PCIVERBOSE
+#option  GSCVERBOSE
+#option  EISAVERBOSE
+#option PCIVERBOSE
 
 config	bsd swap generic
 
-mainbus0 at root		# root "bus"
-
-mem*	at mainbus0		# /dev/*mem and memory controller (Viper)
-pdc0	at mainbus0		# PDC/IODC wrapper for boot console
-cpu*	at mainbus0 #irq 31	# HP PA-RISC cpu
-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 28	# Wax may host EISA as well
-eba*	at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
-#vmeb*	at mainbus0 irq ?	# VME bus adapter
-#dino*	at mainbus0 irq ?	# PCI bus adapter
-
-#sti*	at mainbus0 irq ?	# [H]CRX-{8,24,48}[Z] graphics
-
-# internal i/o space
-gsc*	at lasi?		# 712,715/100,725/75,725/100
-gsc*	at asp?			# 7xx
-#gsc*	at wax?			# 715?
-
-#vme*	at vmeb?
-#pci*	at dino?
-eisa*	at eba?
-#eisa*	at wax?
-#isa*	at eba?
-#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
-lpt0	at gsc? irq 7	# both com and lpt are on WD16C552
-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?
-#atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
-#audio* at atwo?
-pckbc*	at gsc? irq 27
-pckbd*	at pckbc?	# PS/2 keyboard
-pms*	at pckbc?	# PS/2 mouse
-#fdc*	at gsc?		# PC floppy controller (WD37C65C)
-#option	FD_DEBUG
-
-# EISA devices
-#vga*	at eisa? slot ?
-#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
-ep*	at eisa? slot ?
-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
-
-# PCI devices
-#myri*	at pci? dev ? function ?	# ANSI/VITA-26-1998 Gbit iface
-
-# 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
-
 #atapibus* at wdc?
 #wd*	at wdc? drive ?
 #acd*	at atapibus? drive ?
-
+ 
 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 ?
+#cd*	at scsibus? target ? lun ?
 
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index fde88e5fe1e..7328756c303 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,132 +1,21 @@
-#	$OpenBSD: RAMDISK,v 1.2 1999/02/25 17:03:24 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.3 1999/04/20 20:32:19 mickey Exp $
 #
-# Generic kernel config w/ root on ram disk (all that is supportted)
+# Generic kernel config (all that is supportted)
 #
 
-machine	hppa
-
-include "/sys/conf/GENERIC"
+include	"arch/hppa/conf/generic.hppa"
 maxusers	8
 
-# Support for various CPU types
-option	HP7000		# PCX-S
-option	HP7100
-option	HP7150		# PCX-T
-option	HP7100LC	# PCX-L
-option	HP7200
-option	HP7250		# PCX-T*
-#option	HP7300LC	# PCX-L2
-#option	HP8000		# PCX-U  (in 32bit mode)
-#option	HP8200		# PCX-U+ (in 32bit mode)
-#option	HP8500		# PCX-W  (in 32bit mode)
-
-option		FPEMUL
-option		USELEDS		# blink w/ 'em
-
-#option	 	COMPAT_HPUX	# HP-UX binary compatibility
-#option	 	COMPAT_OSF1	# OSF1 binary compatibility
-#option	 	COMPAT_LINUX	# MkLinux binary compatibility
+option  GSCVERBOSE
+option  EISAVERBOSE
+#option PCIVERBOSE
 
-option	GSCVERBOSE
-option	EISAVERBOSE
-#option	PCIVERBOSE
-
-# Options for the ramdisk.
-option	MINIROOTSIZE=4096
 option	RAMDISK_HOOKS
+option	MINIROOTSIZE=4096
 
-config	bsd root rd0 swap rd0
-
-mainbus0 at root		# root "bus"
-
-mem*	at mainbus0
-cpu*	at mainbus0
-pdc0	at mainbus0
-
-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 28	# Wax may host EISA as well
-eba*	at mainbus0 irq 17	# EISA Bus Adapter (i82350 or TI???)
-#vmeb*	at mainbus0 irq ?	# VME bus adapter
-#dino*	at mainbus0 irq ?	# PCI bus adapter
-
-#sti*	at mainbus0 irq ?	# [H]CRX-{8,24,48}[Z] graphics
-
-# internal i/o space
-gsc*	at lasi?		# 712,715/100,725/75,725/100
-gsc*	at asp?			# 7xx
-#gsc*	at wax?			# 715?
-
-#vme*	at vmeb?
-#pci*	at dino?
-eisa*	at eba?
-#eisa*	at wax?
-#isa*	at eba?
-#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
-lpt0	at gsc? irq 7	# LPT centronics iface
-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?
-#atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
-#audio* at atwo?
-pckbc*	at gsc? irq 27
-pckbd*	at pckbc?	# PS/2 keyboard
-#pms*	at pckbc?	# PS/2 mouse
-#fdc*	at gsc?		# PC floppy controller (WD37C65C)
-#option	FD_DEBUG
-
-# EISA devices
-#vga*	at eisa? slot ?
-#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
-ep*	at eisa? slot ?
-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
-
-# PCI devices
-#myri*	at pci? dev ? function ?	# ANSI/VITA-26-1998 Gbit iface
-
-# 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
-
-#atapibus* at wdc?
-#wd*	at wdc? drive ?
-#acd*	at atapibus? drive ?
-
-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 ?
+config	bsd root on rd0a swap on rd0b
 
 pseudo-device	rd	2
 
+sd*	at scsibus? target ? lun ?
+#cd*	at scsibus? target ? lun ?
diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE
new file mode 100644
index 00000000000..702a1769699
--- /dev/null
+++ b/sys/arch/hppa/conf/SHEPHERD_PIE
@@ -0,0 +1,161 @@
+#	$OpenBSD: SHEPHERD_PIE,v 1.1 1999/04/20 20:32:16 mickey Exp $
+#
+# Diskless kernel config
+#
+
+include	"arch/hppa/conf/std.hppa"
+
+# Support for various CPU types
+option	HP7100_CPU,HP7150_CPU
+option	HP7100LC_CPU
+option	HP7200_CPU,HP7250_CPU
+#option	HP7300_CPU
+#option	HP8000_CPU
+#option	HP8200_CPU
+#option	HP8500_CPU
+
+option	SWAPPAGER, DEVPAGER
+
+option		DDB		# in-kernel debugger
+#makeoptions	DEBUG="-g"	# compile full symbol table
+option		DIAGNOSTIC	# internal consistency checks
+option		DEBUG		# internal debug checks
+option		KTRACE,SYSCALL_DEBUG
+
+option		PMAPDEBUG
+
+option		COMPAT_11	# NetBSD 1.1,
+option		COMPAT_43	# and 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
+
+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 savings 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
+
+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 28	# 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
+
+#sti*	at mainbus0 irq ?	# [H]CRX-{8,24,48}[Z] graphics
+
+# internal i/o space
+gsc*	at lasi?		# 712,715/100,725/75,725/100
+gsc*	at asp?			# 7xx
+#gsc*	at wax?			# 8k ?
+
+#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 kbd? 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
+com0	at gsc? irq 5	# RS/232 serial port
+com1	at gsc? irq 6	# RS/232 serial port
+lpt0	at gsc? irq 7	# both com and lpt are on WD16C552
+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?
+#atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
+#audio* at atwo?
+pckbc*	at gsc? irq 27
+pckbd*	at pckbc?	# PS/2 keyboard
+#pms*	at pckbc?	# PS/2 mouse
+fdc*	at gsc?		# PC floppy controller (WD37C65C)
+option	FD_DEBUG
+
+# EISA devices
+#vga*	at eisa? slot ?
+#sh*	at eisa? slot ?	# Interphase Seahawk 4811 EISA/FDDI board
+ep*	at eisa? slot ?
+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_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
+
+#atapibus* at wdc?
+#wd*	at wdc? drive ?
+#acd*	at atapibus? drive ?
+
+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/files.hppa b/sys/arch/hppa/conf/files.hppa
index 52cc1684d7c..54f39a0e43c 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.11 1999/02/25 16:59:24 mickey Exp $
+#	$OpenBSD: files.hppa,v 1.12 1999/04/20 20:32:19 mickey Exp $
 #
 # hppa-specific configuration info
 
@@ -7,12 +7,6 @@ maxpartitions 16
 
 maxusers 2 8 64
 
-defopt	HP7100
-defopt	HP7100LC
-defopt	HP7150
-defopt	HP7200
-defopt	FPEMUL
-
 # 
 # "workstation console" routines
 #
@@ -74,6 +68,11 @@ device	cpu
 attach	cpu at mainbus
 file	arch/hppa/dev/cpu.c		cpu
 
+device	fpu
+attach	fpu at mainbus
+file	arch/hppa/dev/fpu.c		fpu
+
+# as goes w/ 7100LC, 7300LC, 7200, 8000, 8200
 device	lasi: gscbus
 attach	lasi at mainbus
 file	arch/hppa/dev/lasi.c		lasi
@@ -86,9 +85,9 @@ device	wax: gscbus, eisabus
 attach	wax at mainbus
 file	arch/hppa/dev/wax.c		wax
 
-device	eba: eisabus
-attach	eba at mainbus
-file	arch/hppa/dev/eba.c		eba
+device	mongoose: eisabus
+attach	mongoose at mainbus
+file	arch/hppa/dev/mongoose.c	mongoose
 
 device	dino: pcibus
 attach	dino at mainbus
@@ -117,6 +116,7 @@ device	gsc {[irq = -1]}
 attach	gsc at gscbus
 file	arch/hppa/gsc/gscbus.c		gsc
 
+# com and lpt are both on WD 16C552
 attach	com at gsc with com_gsc
 file	arch/hppa/gsc/com_gsc.c		com
 
@@ -155,6 +155,7 @@ attach	atwo at gsc
 file	arch/hppa/gsc/atwo.c		atwo
 
 # these we don't know yet
+# AMD Supernet2 FDDI ?
 #device	medusa: fddi
 #attach	medusa at gsc
 #file	arch/hppa/gsc/medusa.c		medusa
@@ -179,6 +180,7 @@ file	arch/hppa/hppa/hpux_machdep.c		compat_hpux
 include "compat/osf1/files.osf1"
 file	arch/hppa/hppa/osf1_machdep.c		compat_osf1
 include	"compat/linux/files.linux"
+include "compat/ossaudio/files.ossaudio"
 file	arch/hppa/hppa/linux_machdep.c		compat_linux
 
 # FP emulation
@@ -200,7 +202,7 @@ file	arch/hppa/hppa/process_machdep.c
 file	arch/hppa/hppa/sys_machdep.c
 file	arch/hppa/hppa/trap.c
 file	arch/hppa/hppa/vm_machdep.c
-#file	arch/hppa/hppa/in_cksum.s		inet
+#file	arch/hppa/hppa/in_cksum.S		inet
 file	netinet/in_cksum.c			inet
 file	arch/hppa/dev/clock.c
 
diff --git a/sys/arch/hppa/conf/generic.hppa b/sys/arch/hppa/conf/generic.hppa
new file mode 100644
index 00000000000..b793dab483c
--- /dev/null
+++ b/sys/arch/hppa/conf/generic.hppa
@@ -0,0 +1,116 @@
+#	$OpenBSD: generic.hppa,v 1.1 1999/04/20 20:32:22 mickey 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-S
+option	HP7100_CPU
+option	HP7150_CPU	# PCX-T
+option	HP7100LC_CPU	# PCX-L
+option	HP7200_CPU
+option	HP7250_CPU	# PCX-T*
+#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 28	# 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
+
+sti*	at mainbus0 irq ?	# [H]CRX-{8,24,48}[Z] graphics
+
+# internal i/o space
+gsc*	at lasi?		# 712
+gsc*	at asp?			# 7xx (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
+lpt0	at gsc? irq 7	# both com and lpt are on WD16C552
+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?
+#atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
+#audio* at atwo?
+pckbc*	at gsc? irq 27
+pckbd*	at pckbc?	# PS/2 keyboard
+pms*	at pckbc?	# PS/2 mouse
+#fdc*	at gsc?		# PC floppy controller (WD37C65C)
+#option	FD_DEBUG
+
+# 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
new file mode 100644
index 00000000000..9408f79fcf9
--- /dev/null
+++ b/sys/arch/hppa/conf/std.hppa
@@ -0,0 +1,17 @@
+#	$OpenBSD: std.hppa,v 1.1 1999/04/20 20:32:20 mickey Exp $
+#
+# Standard devices present on every hppa workstation
+#
+
+machine	hppa
+
+option		UVM
+
+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
+#power*	at mainbus0		# power/fail manager
+