factor out common devices/options

1 files changed, 8 insertions, 204 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