Sync with reality, + Serial console on COM2

1 files changed, 28 insertions, 15 deletions

diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index b9a73c83037..09b3e770622 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -1,18 +1,17 @@
-#	$NetBSD: GENERIC,v 1.23.2.1 1995/10/17 12:54:55 tls Exp $
+#	$OpenBSD: OPRAH,v 1.12 1996/11/25 23:09:04 niklas Exp $
 #
-#	GENERIC -- everything that's currently supported
+#	OPRAH -- Niklas Hallqvist's test machine
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
+#option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
-option		I586_CPU
+#option		I586_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
 #option		DUMMY_NOPS	# speed hack; recommended
-option		XSERVER
-option		INSECURE	# insecure; allow /dev/mem writing for X
+#option		XSERVER
 
 maxusers	32		# estimated number of users
 option		TIMEZONE=0	# time zone to adjust RTC time by
@@ -25,6 +24,11 @@ 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		BOOT_CONFIG	# User kernel config
+#option		SCSIDEBUG
+option		COMCONSOLE	# Serial console
+option		CONADDR=0x2f8
+option		CONUNIT=1
 
 option		SYSVMSG		# System V-like message queues
 option		SYSVSEM		# System V-like semaphores
@@ -46,7 +50,7 @@ option		USER_LDT	# user-settable LDT; used by WINE
 option		LKM		# loadable kernel modules
 
 option		FFS		# UFS
-option		QUOTA		# UFS quotas
+#option		QUOTA		# UFS quotas
 option		LFS		# log-structured file system
 option		MFS		# memory file system
 
@@ -59,10 +63,10 @@ option		FDESC		# /dev/fd
 option		FIFO		# FIFOs; RECOMMENDED
 option		KERNFS		# /kern
 option		NULLFS		# loopback file system
-option		PORTAL		# create sockets with open(2)
+#option		PORTAL		# create sockets with open(2)
 option		PROCFS		# /proc
-option		UMAPFS		# NULLFS + uid and gid remapping
-option		UNION		# union file system
+#option		UMAPFS		# NULLFS + uid and gid remapping
+#option		UNION		# union file system
 
 #option		GATEWAY		# packet forwarding
 option		INET		# IP + ICMP + TCP + UDP
@@ -82,12 +86,21 @@ com1	at isa? port 0x2f8 irq 3
 
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 
-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
+#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?
+wds0    at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
+wds1    at isa? port 0x358 irq 11 drq 5
+scsibus* at wds?
+
+sd*	at scsibus? target ? lun ?
+
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370 irq ? drq ?
 fd*	at fdc? drive ?
@@ -107,5 +120,5 @@ 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	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# paging to files