flush

3 files changed, 1 insertions, 351 deletions

diff --git a/sys/arch/i386/compile/.cvsignore b/sys/arch/i386/compile/.cvsignore
index 1b870082530..40bf6d1fa81 100644
--- a/sys/arch/i386/compile/.cvsignore
+++ b/sys/arch/i386/compile/.cvsignore
@@ -9,10 +9,9 @@ INST
 LAP
 NETTAN
 OPRAH
-PCMCIA
 PETRA
 SARUMAN
 SPARE-PARTS
 THREADWAY
-TDR
 WALDORF
+RAMDISK
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
deleted file mode 100644
index ab6fd10df37..00000000000
--- a/sys/arch/i386/conf/PCMCIA
+++ /dev/null
@@ -1,136 +0,0 @@
-#	$OpenBSD: PCMCIA,v 1.10 1997/01/01 20:10:37 graichen Exp $
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-option		I586_CPU
-option		I486_CPU
-option		I386_CPU
-option		INSECURE
-option		GPL_MATH_EMULATE
-
-option		DUMMY_NOPS	# speed hack; recommanded
-option		XSERVER
-
-maxusers	32		# estimated number of users
-option		TIMEZONE=300	# time zone to adjust RTC time by
-option		DST=1		# daylight savings time used by RTC
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-option		DDB		# in-kernel debugger
-#makeoptions	DEBUG="-g"	# compile full symbol table
-#option		DIAGNOSTIC	# internally consistency checks
-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_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-option		COMPAT_09	# NetBSD 0.9,
-option		COMPAT_10	# NetBSD 1.0,
-option		COMPAT_43	# and 4.3BSD
-#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-option		COMPAT_SVR4	# binary compatibility with SVR4
-option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-option		COMPAT_LINUX	# binary compatibility with Linux
-
-option		USER_LDT	# user-settable LDT; used by WINE
-option		LKM		# loadable kernel modules
-
-option		FFS #,QUOTA	# UFS and quotas
-#option		LFS		# log-structured file system
-option		MFS		# memory file system
-
-option		NFSCLIENT	# Network File System client
-option		NFSSERVER	# Network File System server
-option		HAS_VOPLEASE	# XXX
-
-option		APM_NOIDLE
-#option			PCIVERBOSE
-#option			PCMCIA_DEBUG
-#option			PCMCIA_ISA_DEBUG
-
-### SCSI:
-#option			CD9660		# ISO 9660 + Rock Ridge file system
-###
-option		MSDOSFS		# MS-DOS file system
-option		FIFO		# FIFOs; RECOMMENDED
-option		PROCFS		# /proc
-
-#option		GATEWAY		# packet forwarding
-option		INET		# IP + ICMP + TCP + UDP
-#option		NS		# XNS
-#option		ISO,TPIP	# OSI
-#option		EON		# OSI tunneling over IP
-#option		CCITT,LLC,HDLC	# X.25
-
-config		bsd	swap generic
-
-# Local Athena options
-
-option		PCVT_CTRL_ALT_DEL	# For screwed-over Linux weenies
-
-mainbus0 at root
-isa0	at mainbus0
-pci0	at mainbus0 bus 0
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-isadma0	at isa?
-
-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
-
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-
-pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
-
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-fd0	at fdc0 drive 0
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-wd0	at wdc0 drive 0
-
-spkr0	at pckbd? port 0x61
-#apm0	at mainbus?
-
-# Multiple controllers need some testing.  Some laptops have multiple PCIC
-# controllers instead of two-slot controllers.
-# The i82365 (pcic) controller uses the same ports for the first two
-# controllers and for the second two controllers.
-# On some systems there the pcicmaster is a pci-chip (you'll see a pci
-# device of the type "class bridge, subclass PCMCIA, ..." at bootup)
-# you may try the following:
-#
-#   pcicmaster0     at isa? port 0x3000 size 2
-#   pcic0           at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-#
-# IRQ 2/9 doesn't seem to work for status change interrupts, so use one
-# of the higher ones.
-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?
-
-#ed0     at pcmcia? port 0x300 iomem 0xd8000 iosiz 8192 	irq 10
-ed0     at pcmcia? port 0x300 size 0x20 irq 10 slot ?
-ep0     at pcmcia? port 0x300 size 0x10 irq 10 slot ?
-#com1    at pcmcia? port 0x2f8 size 8 irq 5 slot ?
-#com2    at pcmcia? port 0x3e8 size 8 irq 5 slot ?
-com3    at pcmcia? port 0x2e8 size 8	irq 3 slot ?
-
-pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 4		# packet filter
-pseudo-device	ppp	2		# PPP
-pseudo-device	pty	64		# pseudo-terminals
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
deleted file mode 100644
index 2b2f13e6069..00000000000
--- a/sys/arch/i386/conf/TDR
+++ /dev/null
@@ -1,213 +0,0 @@
-#	$OpenBSD: TDR,v 1.21 1997/01/01 20:10:38 graichen Exp $
-#	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
-#
-#	TDR -- Theo Deraadt's 486
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
-option		I586_CPU
-option		GPL_MATH_EMULATE	# floating point 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.
-#option		EXTMEM_SIZE=... # size of extended memory
-
-option		DUMMY_NOPS	# speed hack; recommended
-option		XSERVER
-
-maxusers	10		# estimated number of users
-option		TIMEZONE=420	# time zone to adjust RTC time by
-option		DST=1		# daylight savings time used by RTC
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-option		DDB		# in-kernel debugger
-#option		DIAGNOSTIC	# internal consistency checks
-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_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-option		COMPAT_09	# NetBSD 0.9,
-option		COMPAT_10	# NetBSD 1.0,
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
-#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-option		COMPAT_SVR4	# binary compatibility with SVR4
-#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-
-#option		USER_LDT	# user-settable LDT; used by WINE
-#option		LKM		# loadable kernel modules
-
-option		FFS,QUOTA	# UFS and quotas
-#option		LFS		# log-structured file system
-#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		# create sockets with open(2)
-#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		NS		# XNS
-#option		ISO,TPIP	# OSI
-#option		EON		# OSI tunneling over IP
-#option		CCITT,LLC,HDLC	# X.25
-
-config		bsd	root on sd0 swap on sd0 and sd1 and wd0
-
-mainbus0 at root
-
-isa0	at mainbus0
-eisa0	at mainbus0
-#pci0	at mainbus0
-
-#ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-#pci*	at ppb? bus ?
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-isadma0	at isa?
-
-pc0	at isa? port 0x60 irq 1		# generic PC console device
-#vt0	at isa? port 0x60 irq 1
-#option	 PCVT_NOFASTSCROLL
-
-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 ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-
-#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
-
-ep0	at eisa? slot ?				# 3C579 ethernet cards
-ep1	at eisa? slot ?				# 3C579 ethernet cards
-ep2	at eisa? slot ?				# 3C579 ethernet cards
-ep*	at eisa? slot ?				# 3C579 ethernet cards
-
-#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?
-#aic0	at isa? port 0x340 irq 12	# 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
-#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
-#uha*	at eisa? slot ?			# UltraStor 24f SCSI controllers
-#scsibus* at uha?
-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 7	# 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
-ep1	at isa? port ? irq ?
-ep2	at isa? port ? irq ?
-#ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN & 3C507 ethernet cards
-#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
-
-#sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
-#spkr0	at pckbd? port 0x61
-
-#option		APM_NOIDLE
-#option		PCIVERBOSE
-#option		PCMCIA_DEBUG
-#option		PCMCIA_ISA_DEBUG
-
-#apm0	at mainbus?
-#pcmcia* at pcic?
-
-# Multiple controllers need some testing.  Some laptops have multiple PCIC
-# controllers instead of two-slot controllers.
-# The i82365 (pcic) controller uses the same ports for the first two
-# controllers and for the second two controllers.
-# On some systems there the pcicmaster is a pci-chip (you'll see a pci
-# device of the type "class bridge, subclass PCMCIA, ..." at bootup)
-# you may try the following:
-#
-#   pcicmaster0     at isa? port 0x3000 size 2
-#   pcic0           at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-#
-# IRQ 2/9 doesn't seem to work for status change interrupts, so use one
-# of the higher ones.
-#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
-
-#ed0	at pcmcia? port 0x300 iomem 0xd8000 iosiz 8192 	irq 10
-#ed0	at pcmcia? port 0x300 size 0x20 irq 10 slot ?
-#ep0	at pcmcia? port 0x300 size 0x10 irq 10 slot ?
-#com1	at pcmcia? port 0x2f8 size 8 irq 5 slot ?
-#com2	at pcmcia? port 0x3e8 size 8 irq 5 slot ?
-#com3	at pcmcia? port 0x2e8 size 8 irq 3 slot ?
-
-pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 16		# packet filter
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
-pseudo-device	tun	2		# network tunneling over tty
-
-pseudo-device	pty	32		# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
-pseudo-device	vnd	4		# paging to files