tls rearranges GENERIC/INSTALL

4 files changed, 313 insertions, 44 deletions

diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP
new file mode 100644
index 00000000000..78e503c5adb
--- /dev/null
+++ b/sys/arch/i386/conf/GENERICADP
@@ -0,0 +1,166 @@
+#	$NetBSD: GENERICADP,v 1.1.2.1 1995/10/28 04:05:02 tls 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	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	# internally 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_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		# ?
+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		netbsd	swap generic
+options		GENERIC
+
+isa0	at root
+pci0	at root
+
+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 ?
+
+#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 isa? port 0x60 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?
+ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
+scsibus* at ahb?
+ahc*	at pci? bus ? dev ?		# Adaptec 2940 SCSI controllers
+scsibus* at ahc?
+aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
+scsibus* at aic?
+
+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, 3C507, and Etherexpress
+#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
+le*	at pci? bus ? dev ?
+de*	at pci? bus ? dev ?
+
+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 isa? ...
+
+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
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERICOTHER
index b23ea11d43d..6c16ad71e1a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERICOTHER
@@ -1,6 +1,7 @@
-#	$NetBSD: GENERIC,v 1.23.2.1 1995/10/17 12:54:55 tls Exp $
+#	$NetBSD: GENERICOTHER,v 1.1.2.1 1995/10/28 04:05:04 tls Exp $
 #
-#	GENERIC -- everything that's currently supported
+#	GENERICOTHER -- everything that's currently supported, except
+#	             Adaptec SCSI controllers.
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -73,7 +74,7 @@ options		ISO,TPIP	# OSI
 options		EON		# OSI tunneling over IP
 options		CCITT,LLC,HDLC	# X.25
 
-config		bsd	swap generic
+config		netbsd	swap generic
 options		GENERIC
 
 isa0	at root
@@ -107,15 +108,6 @@ mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
 mms1	at isa? port 0x238 irq 5
 #pms0	at isa? port 0x60 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?
-ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
-ahc*	at pci? bus ? dev ?		# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
-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 ?
diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP
new file mode 100644
index 00000000000..50dc61ca4dc
--- /dev/null
+++ b/sys/arch/i386/conf/INSTADP
@@ -0,0 +1,115 @@
+#	$NetBSD: INSTADP,v 1.1.2.1 1995/10/28 04:05:06 tls Exp $
+#
+#	INSTADP -- like GENERICADP.  This supports only Adaptec SCSI
+#                     adapters.  This kernel is GENERICADP 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		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		netbsd	swap generic
+options		GENERIC
+
+isa0	at root
+pci0	at root
+
+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 ?
+
+#cy0	at isa? ...
+
+lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+lpt1	at isa? port 0x278
+lpt2	at isa? port 0x3bc
+
+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?
+ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
+scsibus* at ahb?
+ahc*	at pci? bus ? dev ?		# Adaptec 2940 SCSI controllers
+scsibus* at ahc?
+aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
+scsibus* at aic?
+
+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, 3C507, and Etherexpress
+#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
+le*	at pci? bus ? dev ?
+de*	at pci? bus ? dev ?
+
+pseudo-device	loop	1		# network loopback
+pseudo-device	sl	2		# CSLIP
+
+pseudo-device	pty	64		# pseudo-terminals
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTOTHER
index d42ba00fe7d..30e4b81c719 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTOTHER
@@ -1,16 +1,10 @@
-#	$NetBSD: INSTALL,v 1.5.2.1 1995/10/17 12:54:58 tls Exp $
+#	$NetBSD: INSTOTHER,v 1.1.2.1 1995/10/28 04:05:08 tls Exp $
 #
-#	INSTALL -- somewhat generic kernel with a snowball's chance of
-#		   fitting on an install floppy.
+#	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.
 #
-#	This kernel MUST consist (for users' sanity) of a subset of 
-#	the GENERIC configuration.  It also should support X reasonably
-#	(though the SysV SHM extensions won't work).
-#
-#	To avoid a maintenance nightmare, this kernel consists of GENERIC
-#	with missing options/devices/etc. REMOVED rather than commented
-#	out.  That makes it easy to diff agains GENERIC, to make sure that
-#	it really is a subset of the functionality.
+#       Install kernels no longer support X.
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -21,8 +15,6 @@ options		I586_CPU
 options		MATH_EMULATE	# floating point emulation
 
 #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
@@ -33,13 +25,11 @@ 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_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_43	# and 4.3BSD
 
 options		LKM		# loadable kernel modules
 
@@ -49,11 +39,13 @@ 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
+config		netbsd	swap generic
 options		GENERIC
 
 isa0	at root
@@ -62,35 +54,33 @@ pci0	at root
 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 ?
+
+#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
-
-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?
-ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
-ahc0	at pci? bus ? dev ?
-scsibus* at ahc?
-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? bus ? dev ?		# 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
@@ -99,11 +89,14 @@ 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 ?
 
 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
@@ -111,8 +104,11 @@ 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, 3C507, and EtherExpress
+ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN, 3C507, and Etherexpress
+#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 le*	at pci? bus ? dev ?
 de*	at pci? bus ? dev ?