one GENERIC, one INST

5 files changed, 17 insertions, 562 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 846ba592806..be8160fdedd 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.15 1996/05/15 08:56:15 mickey Exp $
-#	$NetBSD: GENERIC,v 1.45 1996/05/07 00:59:53 thorpej Exp $
+#	$OpenBSD: GENERIC,v 1.16 1996/05/27 01:14:06 deraadt Exp $
+#	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -131,21 +131,20 @@ mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
 mms1	at isa? port 0x238 irq 5
 #pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
 
+bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
+bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
+bt2	at isa? port ? irq ?
+scsibus* at bt?
 aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 scsibus* at aha?
 ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
 scsibus* at ahb?
 ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
+ahc*	at eisa? slot ?
 scsibus* at ahc?
-ahe0	at eisa? slot ?			# Adaptec 284x SCSI controllers
-scsibus* at ahe?
 aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
 scsibus* at aic?
-bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt2	at isa? port ? irq ?
-scsibus* at bt?
 ncr*	at pci? dev ? function ?	# NCR 538XX SCSI controllers
 scsibus* at ncr?
 sea0	at isa? iomem 0xc8000 irq 5
@@ -186,9 +185,12 @@ ep0	at isa? port ? irq ?			# 3C509 ethernet cards
 ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
 ie1	at isa? port 0x300 irq 10		# EtherExpress
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
+ep0	at eisa? slot ?
 ep*	at eisa? slot ?				# 3C579 ethernet cards
+fea*	at eisa? slot ?				# DEC DEFEA FDDI cards
 le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
 de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
+ep0	at pci? dev ? function ?		# 3C590 ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
 ed*     at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
 ep*     at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP
deleted file mode 100644
index 1adc521a928..00000000000
--- a/sys/arch/i386/conf/GENERICADP
+++ /dev/null
@@ -1,203 +0,0 @@
-#	$OpenBSD: GENERICADP,v 1.13 1996/05/14 18:38:14 mickey Exp $
-#	$NetBSD: GENERICADP,v 1.21 1996/05/07 00:59:59 thorpej Exp $
-#
-#	GENERICADP -- everything that's currently supported, except non-
-#                     Adaptec SCSI controllers.
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
-#options	VM86		# Virtual 8086 emulation
-
-# Some BIOSes don't get the size of extended memory right.  If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
-
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
-options		MACHINE_NONCONTIG
-
-maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-options		DDB		# in-kernel debugger
-#makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_11	# NetBSD 1.1,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-options		ISO,TPIP	# OSI
-options		EON		# OSI tunneling over IP
-options		CCITT,LLC,HDLC	# X.25
-
-config		bsd	swap generic
-options		GENERIC
-
-mainbus0 at root
-
-isa0	at mainbus0
-eisa0	at mainbus0
-pci0	at mainbus0 bus ?
-
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-pci*	at ppb? bus ?
-
-pcicmaster0     at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1 at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
-
-pcmcia* at pcic?
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-
-pc0	at isa? port 0x60 irq 1		# generic PC console device
-#vt0	at isa? port 0x60 irq 1
-
-com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
-
-#cy0	at isa? ...
-
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-lpt1	at isa? port 0x278
-lpt2	at isa? port 0x3bc
-
-lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-lms1	at isa? port 0x238 irq 5
-mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-mms1	at isa? port 0x238 irq 5
-#pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
-
-aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
-aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
-scsibus* at aha?
-ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
-ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
-aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
-scsibus* at aic?
-ahe0	at eisa? slot ?			# Adaptec 284x SCSI controllers
-scsibus* at ahe?
-
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
-st*	at scsibus? target ? lun ?	# SCSI tape drives
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-ch*	at scsibus? target ? lun ?	# SCSI autochangers
-
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?
-
-mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-#wdc1	at isa? port 0x170 irq ?
-wd*	at wdc? drive ?
-
-wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
-
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
-#eg0	at isa? ...				# 3C505 ethernet cards
-el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
-ep0	at isa? port ? irq ?			# 3C509 ethernet cards
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-ie1	at isa? port 0x300 irq 10		# EtherExpress
-#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
-ep*	at eisa? slot ?				# 3C579 ethernet cards
-le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
-de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
-ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-ed*     at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
-ep*     at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
-fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
-
-pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
-sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
-
-sb0	at isa? port 0x220 irq 7 drq 1		# SoundBlaster
-wss0	at isa? port 0x530 irq 10 drq 0		# Windows Sound System
-pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
-gus0	at isa? port 0x220 irq 7 drq 1 flags 6	# Gravis Ultra Sound (record drq for full-duplex)
-aria0	at isa? port 0x280 irq 10 flags 1	# Prometheus/Aria 16
-#spkr0	at pckbd? port 0x61
-
-# Joystick driver. Probe is a little strange; add only if you have one.
-#joy0	at isa? port 0x201
-
-pseudo-device	loop	1		# 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	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
diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER
deleted file mode 100644
index f29b9c143a2..00000000000
--- a/sys/arch/i386/conf/GENERICOTHER
+++ /dev/null
@@ -1,206 +0,0 @@
-#	$OpenBSD: GENERICOTHER,v 1.11 1996/05/14 18:38:14 mickey Exp $
-#	$NetBSD: GENERICOTHER,v 1.20 1996/05/07 01:00:05 thorpej Exp $
-#
-#	GENERICOTHER -- everything that's currently supported, except
-#	             Adaptec SCSI controllers.
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
-#options	VM86		# Virtual 8086 emulation
-
-# Some BIOSes don't get the size of extended memory right.  If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
-
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
-options		MACHINE_NONCONTIG
-
-maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-options		DDB		# in-kernel debugger
-#makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_11	# NetBSD 1.1,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-options		ISO,TPIP	# OSI
-options		EON		# OSI tunneling over IP
-options		CCITT,LLC,HDLC	# X.25
-
-config		bsd	swap generic
-options		GENERIC
-
-mainbus0 at root
-
-isa0	at mainbus0
-eisa0	at mainbus0
-pci0	at mainbus0
-
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-pci*	at ppb? bus ?
-
-pcicmaster0     at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1 at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
-
-pcmcia* at pcic?
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-
-pc0	at isa? port 0x60 irq 1		# generic PC console device
-#vt0	at isa? port 0x60 irq 1
-
-com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
-
-#cy0	at isa? ...
-
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-lpt1	at isa? port 0x278
-lpt2	at isa? port 0x3bc
-
-lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-lms1	at isa? port 0x238 irq 5
-mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-mms1	at isa? port 0x238 irq 5
-#pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
-
-bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt2	at isa? port ? irq ?
-scsibus* at bt?
-ncr*	at pci? dev ? function ?	# NCR 538XX SCSI controllers
-scsibus* at ncr?
-sea0	at isa? iomem 0xc8000 irq 5
-scsibus* at sea?
-uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
-scsibus* at uha?
-wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
-wds1	at isa? port 0x358 irq 11 drq 5
-scsibus* at wds?
-
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
-st*	at scsibus? target ? lun ?	# SCSI tape drives
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-ch*	at scsibus? target ? lun ?	# SCSI autochangers
-
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?
-
-mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-#wdc1	at isa? port 0x170 irq ?
-wd*	at wdc? drive ?
-
-wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
-
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
-#eg0	at isa? ...				# 3C505 ethernet cards
-el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
-ep0	at isa? port ? irq ?			# 3C509 ethernet cards
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-ie1	at isa? port 0x300 irq 10		# EtherExpress
-#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
-ep*	at eisa? slot ?				# 3C579 ethernet cards
-le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
-de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
-ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-ed*     at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
-ep*     at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
-fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
-
-pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
-sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
-
-sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
-wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
-pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
-gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
-#spkr0	at pckbd? port 0x61
-
-# Joystick driver. Probe is a little strange; add only if you have one.
-#joy0	at isa? port 0x201
-
-pseudo-device	loop	1		# 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	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
diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INST
index 233272bbbf4..5408313eb45 100644
--- a/sys/arch/i386/conf/INSTADP
+++ b/sys/arch/i386/conf/INST
@@ -1,5 +1,5 @@
-#	$OpenBSD: INSTADP,v 1.9 1996/05/10 12:44:26 deraadt Exp $
-#	$NetBSD: INSTADP,v 1.15 1996/05/07 01:00:12 thorpej Exp $
+#	$OpenBSD: INST,v 1.1 1996/05/27 01:14:07 deraadt Exp $
+#	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #	INSTADP -- like GENERICADP.  This supports only Adaptec SCSI
 #                     adapters.  This kernel is GENERICADP with lines
@@ -94,6 +94,10 @@ lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 lpt1	at isa? port 0x278
 lpt2	at isa? port 0x3bc
 
+bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
+bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
+bt2	at isa? port ? irq ?
+scsibus* at bt?
 aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 scsibus* at aha?
@@ -131,6 +135,7 @@ ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
 ie1	at isa? port 0x300 irq 10		# EtherExpress
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 ep*	at eisa? slot ?				# 3C579 ethernet cards
+fea*	at eisa? slot ?				# DEC DEFEA FDDI cards
 le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
 de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER
deleted file mode 100644
index 73a18f539d2..00000000000
--- a/sys/arch/i386/conf/INSTOTHER
+++ /dev/null
@@ -1,143 +0,0 @@
-#	$OpenBSD: INSTOTHER,v 1.7 1996/05/10 12:44:26 deraadt Exp $
-#	$NetBSD: INSTOTHER,v 1.14 1996/05/07 01:00:21 thorpej Exp $
-#
-#	INSTOTHER -- like GENERICOTHER.  This supports only non-Adaptec SCSI
-#                     adapters.  This kernel is GENERICOTHER with lines
-#                     deleted, not commented out, so it is easy to maintain.
-#
-#       Install kernels no longer support X.
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
-
-#options	DUMMY_NOPS	# speed hack; recommended
-options		MACHINE_NONCONTIG
-
-maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-#makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_11	# NetBSD 1.1,
-
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-
-options		NFSCLIENT	# Network File System client
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-
-options		INET		# IP + ICMP + TCP + UDP
-
-config		bsd	swap generic
-options		GENERIC
-
-mainbus0 at root
-
-isa0	at mainbus0
-eisa0	at mainbus0
-pci0	at mainbus0
-
-ppb*	at pci? dev ? function ? # PCI-PCI bridges
-pci*	at ppb? bus ?
-
-pcicmaster0     at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1 at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
-
-pcmcia* at pcic?
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-
-pc0	at isa? port 0x60 irq 1		# generic PC console device
-#vt0	at isa? port 0x60 irq 1
-
-com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast? slave ? flags 1
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
-
-#cy0	at isa? ...
-
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-lpt1	at isa? port 0x278
-lpt2	at isa? port 0x3bc
-
-bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bt2	at isa? port ? irq ?
-scsibus* at bt?
-ncr*    at pci? dev ? function ?        # NCR 538XX SCSI controllers
-scsibus* at ncr?
-sea0	at isa? iomem 0xc8000 irq 5
-scsibus* at sea?
-uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
-scsibus* at uha?
-wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
-wds1	at isa? port 0x358 irq 11 drq 5
-scsibus* at wds?
-
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
-st*	at scsibus? target ? lun ?	# SCSI tape drives
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-ch*	at scsibus? target ? lun ?	# SCSI autochangers
-
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-#wdc1	at isa? port 0x170 irq ?
-wd*	at wdc? drive ?
-
-wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
-
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
-#eg0	at isa? ...				# 3C505 ethernet cards
-el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
-ep0	at isa? port ? irq ?			# 3C509 ethernet cards
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
-ep*     at eisa? slot ?                         # 3C579 ethernet cards
-le*     at pci? dev ? function ?                # PCnet-PCI based ethernet cards
-de*     at pci? dev ? function ?                # DC21X4X-based ethernet cards
-ep*     at pci? dev ? function ?                # 3C590 ethernet cards
-ed*     at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
-ep*     at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
-
-pseudo-device	loop	1		# network loopback
-pseudo-device	sl	2		# CSLIP
-
-pseudo-device	pty	64		# pseudo-terminals