update to netbsd

1 files changed, 24 insertions, 13 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 3f2ebcab3b3..916e67467c6 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,10 +1,8 @@
-#	$NetBSD: GENERIC,v 1.8 1995/08/03 00:09:19 cgd Exp $
+#	$NetBSD: GENERIC,v 1.9 1995/11/23 02:35:01 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 
-machine		alpha
-
-makeoptions	DEBUG="-g"
+include	"std.alpha"
 
 maxusers 8
 
@@ -13,9 +11,11 @@ options		GENERIC
 
 # CPU Support
 options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
-options		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 options		DEC_3000_300	# Pelican etc:	3000/300*
 options		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
+options		DEC_KN20AA	# KN20AA:	AlphaStation 600
+options		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
+#options	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 
 # needs to be set per system
 options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
@@ -30,6 +30,7 @@ options		KTRACE			# System call tracing support
 options		FIFO		# POSIX fifo support (in all file systems)
 options		FFS		# Fast file system
 options		MFS		# Memory-based file system
+options		NFSSERVER	# Sun NFS-compatible file system server
 options		NFSCLIENT	# Sun NFS-compatible file system client
 
 # Networking options
@@ -38,6 +39,9 @@ options		INET		# Internet protocol suite
 # 4.3BSD compatibility.  Should be optional, but necessary for now.
 options		COMPAT_43
 
+# Binary compatibility with previous versions of NetBSD.
+options		COMPAT_10
+
 # OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
 #options	COMPAT_OSF1
 
@@ -48,7 +52,7 @@ options		LKM
 #options	INSECURE
 
 # Misc. options
-options		PCIVERBOSE		# recognize "unknown" PCI devices
+options		PCIVERBOSE	# recognize "unknown" PCI devices
 
 config		netbsd		swap generic
 
@@ -71,21 +75,28 @@ esp1	at	tcds? slot ?
 
 # PCI host bus adapter support
 apecs*	at	mainbus?
-#lca*	at	cpu?
+cia*	at	mainbus?
+lca*	at	mainbus?
 
 # PCI bus support
 pci*	at	apecs?
-#pci*	at	lca?
+pci*	at	cia?
+pci*	at	lca?
+pci*	at	ppb?
 
 # PCI devices
 de*	at	pci?
-sio*	at	pci?
 ncr*	at	pci?
-tga*	at	pci?
+pceb*	at	pci?
 pcivga*	at	pci?
+ppb*	at	pci?
+sio*	at	pci?
+tga*	at	pci?
 
-# ISA bus support
-isa0	at	sio?
+# ISA/EISA bus support
+isa*	at	pceb?
+eisa*	at	pceb?
+isa*	at	sio?
 
 # ISA devices
 clock0	at	isa? port 0x70
@@ -94,7 +105,7 @@ pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
 com0	at	isa? port 0x3f8 irq 4		# standard serial ports
 com1	at	isa? port 0x2f8 irq 3
 lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
+#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 
 # SCSI bus support
 scsibus* at	esp?