Changes, changes.

1 files changed, 74 insertions, 68 deletions

diff --git a/sys/arch/alpha/conf/CARTMAN b/sys/arch/alpha/conf/CARTMAN
index af39327c95b..599d91a4ad9 100644
--- a/sys/arch/alpha/conf/CARTMAN
+++ b/sys/arch/alpha/conf/CARTMAN
@@ -1,82 +1,82 @@
-#	$OpenBSD: CARTMAN,v 1.3 1998/03/18 15:54:01 angelos Exp $
+#       $OpenBSD: CARTMAN,v 1.4 1998/03/18 22:18:17 angelos Exp $
 #
 # Sample configuration for PC164(SX) machines.
 
-machine	alpha
-option		SWAPPAGER, DEVPAGER
-maxusers 32
+machine	alpha			# architecture, used by config; REQUIRED
 
-# CPU Support
-options         DEC_3000_500    # Flamingo etc: 3000/[4-9]00*
-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_EB164	# EB164:	AlphaPC 164
+# CPU Support; at least one is REQUIRED
+#option		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
+#option		DEC_3000_300	# Pelican etc:	3000/300*
+#option		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
+#option		DEC_KN20AA	# KN20AA:	AlphaStation 600
+#option		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
+option		DEC_EB164	# EB164:	AlphaPC 164
+#option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 
-# needs to be set per system
-options		TIMEZONE=0		# Minutes west of GMT (for param.c)
-options		DST=0			# Daylight savings rules (for param.c)
+# Needs to be set per system
+option		TIMEZONE=0		# Minutes west of GMT (for param.c)
+option		DST=0			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
+maxusers	32			# estimated number of users
+
+option		SWAPPAGER		# paging; REQUIRED
+option		DEVPAGER		# mmap() of devices
+
+#option		DEBUG, DIAGNOSTIC	# Extra kernel debugging
+#option		KTRACE			# System call tracing support
 
 # File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		QUOTA		# User and group quotas for the FFS
-options		MFS		# Memory-based file system
-options		CD9660		# ISO-9660 CD-ROM FS (w/RockRidge extensions)
-options		MSDOSFS		# MS-DOS-compatible file system
-options		NFSSERVER	# Sun NFS-compatible file system server
-options		NFSCLIENT	# Sun NFS-compatible file system client
-options		KERNFS		# Kernel variable file system (/kern)
-options		FDESC		# File descriptor file system (/dev/fd)
+option		FIFO		# POSIX fifo support (in all file systems)
+option		FFS		# Fast file system
+#option		MFS		# Memory-based file system
+option		KERNFS		# pseudo-fs to get at kernel internals
+#option		NFSSERVER	# Sun NFS-compatible file system server
+#option		NFSCLIENT	# Sun NFS-compatible file system client
+option		CD9660		# ISO 9660 + Rock Ridge file system
+#option 	QUOTA
 
 # Networking options
-options		INET		# Internet protocol suite
-options		GATEWAY		# packet forwarding and more mbuf space
-options		IPFILTER
-options		IPFILTER_LOG
-options		IPSEC
-options		ENCDEBUG
-
-# Compatibility with 4.2BSD implementation of TCP/IP.  Not suggested.
-#options	TCP_COMPAT_42
+option		INET		# Internet protocol suite
+#option 		GATEWAY
+#option		IPFILTER
+#option 	IPFILTER_LOG
+#option		IPSEC
+#option		ENCDEBUG
 
 # 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
+#option		COMPAT_43
 
 # Binary compatibility with previous versions of NetBSD.
-#options	COMPAT_09
-options		COMPAT_10
-options		COMPAT_11
-options		COMPAT_12
+#option		COMPAT_09
+#option		COMPAT_10
+#option		COMPAT_11
+#option		COMPAT_12
 
 # OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
-#options	COMPAT_OSF1
+#option		COMPAT_OSF1
 
 # System V-like message queues
-options		SYSVMSG
+options         SYSVMSG
 
 # System V-like semaphores
-options		SYSVSEM
+options         SYSVSEM
 
 # System V-like shared memory
-options		SYSVSHM
+options         SYSVSHM
 
 # Loadable Kernel Modules
-options		LKM
+#option		LKM
 
 # Misc. options
-#options	EXTENT_DEBUG		# extent alloc/dealloc code debugging
-options		FIX_UNALIGNED_VAX_FP	# fix unaligned VAX FP loads & stores
-options		PCIVERBOSE		# recognize "unknown" PCI devices
-options		SANE_PROM
+#option		EISAVERBOSE		# recognize "unknown" EISA devices
+#option		PCIVERBOSE		# recognize "unknown" PCI devices
+#option		TCVERBOSE		# recognize "unknown" TC devices
+#option		SCSITERSE		# less verbose scsi error messages
+option		SANE_PROM
 
-#config		bsd	swap generic
 config		bsd	root on wd0 swap on wd0
+#config		bsd	swap generic
 #config		bsd	root on sd0 swap on sd0
 #config		bsd	root nfs swap nfs
 
@@ -84,17 +84,20 @@ mainbus0 at	root
 cpu*	at	mainbus0
 
 # PCI host bus adapter support
+apecs*	at	mainbus?
 cia*	at	mainbus?
+lca*	at	mainbus?
 
 # PCI bus support
+pci*	at	apecs?
 pci*	at	cia?
+pci*	at	lca?
 
 # PCI devices
 de*	at	pci? dev ? function ?		# 21x4[012]-based Ethernet
-en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
+ed*	at	pci? dev ? function ?		# NE2000-compat ethernet cards
 ep*	at	pci? dev ? function ?		# 3COM 3c59x (untested)
 vga*	at	pci? dev ? function ?		# PCI VGA graphics
-#ppb*	at	pci? dev ? function ?		# PCI-PCI bridges
 sio*	at	pci? dev ? function ?		# Intel PCI-ISA bridge
 
 # ISA/EISA bus support
@@ -104,33 +107,36 @@ isa*	at	sio?
 mcclock* at	isa? port 0x70
 pcppi*	at	isa?				# PC prog. periph. interface
 pckbd*	at	pcppi?				# PC keyboard (kbd port)
-pms*	at	pcppi?				# PS/2-style mouse (aux port)
+#pms*	at	pcppi?				# PS/2-style mouse (aux port)
 com*	at	isa? port 0x3f8 irq 4		# standard serial ports
 com*	at	isa? port 0x2f8 irq 3
-lpt*	at	isa? port 0x3bc irq 7		# standard parallel port
+#lpt*	at	isa? port 0x3bc irq 7		# standard parallel port
 vga*	at	isa?				# ISA (EISA: XXX) VGA
-wdc0    at      isa? port 0x1f0 irq 14          # ST506, ESDI, and IDE
-wdc1    at      isa? port 0x170 irq 15          # controllers
-#cy0    at      isa? iomem 0xd4000 irq 12       # ISA cyclom card
+ed0	at	isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and
+ed1	at	isa? port 0x250 iomem 0xd8000 irq 9	# NE[12]000 ethercards
+ed2	at	isa? port 0x300 iomem 0xcc000 irq 10
 #wss*	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
+wdc0	at	isa? port 0x1f0 irq 14		# ST506, ESDI, and IDE
+wdc1	at	isa? port 0x170 irq 15		# controllers
+#cy0	at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
 
 # devices/busses hanging of IDE controllers
-atapibus* at    wdc?                            # Virtual ATAPI bus
-wd*     at      wdc? drive ?                    # ST506/ESDI/IDE disks
+atapibus* at	wdc?				# Virtual ATAPI bus
+wd*	at	wdc? drive ?			# ST506/ESDI/IDE disks
 
 # ATAPI devices
-acd*    at      atapibus? drive?                # ATAPI CD-ROM
+acd*	at	atapibus? drive?		# ATAPI CD-ROM
 
 # Workstation Console attachments
 wscons*	at	vga?
 
-pseudo-device	bpfilter	16
+#pseudo-device	bpfilter	16
 pseudo-device	loop
-pseudo-device	ppp		4
 pseudo-device	pty		64
-pseudo-device	rd		1
-pseudo-device	sl		4
-pseudo-device	strip		4
-pseudo-device	tun		4
-pseudo-device	vnd		4
-pseudo-device	enc		1
+#pseudo-device	rd		1
+#pseudo-device	sl		4
+#pseudo-device	vnd		4
+#pseudo-device	enc		1
+#pseudo-device	strip		4
+#pseudo-device	vnd		4
+#pseudo-device	ppp		4