kernel is /bsd; GENERIC is not an option

10 files changed, 19 insertions, 27 deletions

diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 6dd3abdf3cd..f4be44346d4 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,7 +1,7 @@
-#	$OpenBSD: ALL,v 1.3 1996/06/16 11:11:05 deraadt Exp $
+#	$OpenBSD: ALL,v 1.4 1996/06/24 17:07:29 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
-#	GENERIC -- everything that's currently supported
+#	ALL -- everything that's currently supported
 #
 
 machine		i386		# architecture, used by config; REQUIRED
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index dd90f6bd0e5..6885ba6c5f4 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.9 1996/06/16 11:11:06 deraadt Exp $
+#	$OpenBSD: DISKLESS,v 1.10 1996/06/24 17:07:30 deraadt Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -77,7 +77,6 @@ options		EON		# OSI tunneling over IP
 options		CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on nfs swap on nfs
-#options	GENERIC
 
 mainbus0 at root
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e496eeac2fb..a396f2eb826 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.23 1996/06/23 19:59:41 maja Exp $
+#	$OpenBSD: GENERIC,v 1.24 1996/06/24 17:07:32 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -28,7 +28,7 @@ options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options		COMPAT_LINUX	# binary compatibility with Linux
 options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
 
-#options	BOOT_CONFIG	# add support for boot -c
+options		BOOT_CONFIG	# add support for boot -c
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index 35c1da388fe..0dfb544648a 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-#	$OpenBSD: INST,v 1.5 1996/06/23 13:53:29 deraadt Exp $
+#	$OpenBSD: INST,v 1.6 1996/06/24 17:07:33 deraadt Exp $
 #	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #       Install kernels no longer support X.
@@ -83,7 +83,11 @@ com2	at isa? port 0x3e8 irq 5
 #com*	at rtfps? slave ?
 com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
 
-#cy0	at isa? ...
+# option for using CD1400 handshaking for incoming data
+# requires a special cable that exchanges the RTS and DTR lines
+# options CY_HW_RTS
+#cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
+#cy1	at pci?				# PCI cyclom card
 
 #lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 #lpt1	at isa? port 0x278
@@ -122,7 +126,7 @@ 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
+#eg0	at isa? port 0x310 irq 5		# 3C505/Etherlink+ 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
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index 6e2b4cc3f37..dc3aeb006e7 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.6 1996/06/16 11:11:09 deraadt Exp $
+#	$OpenBSD: LAP,v 1.7 1996/06/24 17:07:33 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -75,7 +75,6 @@ options		INET		# IP + ICMP + TCP + UDP
 #options	CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on wd0 swap on wd0
-#options	GENERIC
 
 mainbus0 at root
 
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 4f47b4595be..4f57bb0d6f1 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.13 1996/05/27 08:04:52 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.14 1996/06/24 17:07:34 deraadt Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -129,7 +129,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
 	    ${I386}/i386/Locore.c ${CFILES} ${I386}/i386/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 95944e77540..fe6d4de71c8 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.6 1996/06/16 11:11:09 deraadt Exp $
+#	$OpenBSD: NETTAN,v 1.7 1996/06/24 17:07:35 deraadt Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -76,7 +76,6 @@ options		NS		# XNS
 #options		CCITT,LLC,HDLC	# X.25
 
 config		bsd	swap generic
-options		GENERIC
 
 mainbus0	at root
 
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index fb090dfe919..c07a2e8d15d 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -69,7 +69,6 @@ options		UNION		# union file system
 options		INET		# IP + ICMP + TCP + UDP
 
 config		bsd	swap generic
-options		GENERIC
 
 mainbus0	at root
 isa0	at mainbus0
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
index 6ce09948f83..c139634e404 100644
--- a/sys/arch/i386/conf/PCMCIA
+++ b/sys/arch/i386/conf/PCMCIA
@@ -1,10 +1,4 @@
-#	$Id: PCMCIA,v 1.3 1996/06/16 11:11:11 deraadt Exp $
-#	$Source: /cvs/OpenBSD/src/sys/arch/i386/conf/Attic/PCMCIA,v $
-#
-#	ATHENA-AHA	-- ATHENA kernel for Adaptec & others...
-#
-# from:	GENERIC -- everything that's currently supported
-#       NetBSD: GENERIC,v 1.12 1995/02/21 01:43:02 brezak Exp
+#	$OpenBSD: PCMCIA,v 1.4 1996/06/24 17:07:37 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -76,8 +70,7 @@ options		INET		# IP + ICMP + TCP + UDP
 #options	EON		# OSI tunneling over IP
 #options	CCITT,LLC,HDLC	# X.25
 
-config		netbsd	swap generic
-options		GENERIC
+config		bsd	swap generic
 
 # Local Athena options
 
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index 86348d00c22..a878f6888e7 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,4 +1,4 @@
-#	$OpenBSD: TDR,v 1.12 1996/06/16 11:11:12 deraadt Exp $
+#	$OpenBSD: TDR,v 1.13 1996/06/24 17:07:38 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -75,7 +75,6 @@ options		INET		# IP + ICMP + TCP + UDP
 #options	CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on sd0 swap on sd0 and sd1 and wd0
-#options	GENERIC
 
 mainbus0 at root