Remove non-existant machine config -- replace w/laptop config that works

both native and under VMware

3 files changed, 261 insertions, 115 deletions

diff --git a/sys/arch/i386/compile/.cvsignore b/sys/arch/i386/compile/.cvsignore
index 2fa08d53ee3..9d21da4f632 100644
--- a/sys/arch/i386/compile/.cvsignore
+++ b/sys/arch/i386/compile/.cvsignore
@@ -14,5 +14,5 @@ RAMDISK
 RAMDISKB
 RAMDISKC
 RAMDISK_CD
-SARUMAN
+SOLO
 WALDORF
diff --git a/sys/arch/i386/conf/SARUMAN b/sys/arch/i386/conf/SARUMAN
deleted file mode 100644
index b46e429a148..00000000000
--- a/sys/arch/i386/conf/SARUMAN
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-#	SARUMAN -- i486DX/50 EISA bus
-#
-#	$OpenBSD: SARUMAN,v 1.9 1999/10/03 21:08:15 niklas Exp $
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-#option		I386_CPU	# CPU classes; at least one is REQUIRED
-#option		I486_CPU
-option		I586_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation
-
-option		PCIVERBOSE	# verbose PCI device information
-#option		EISAVERBOSE	# verbose EISA device information
-
-option		DUMMY_NOPS	# speed hack; recommanded
-option		XSERVER		# diddle with console driver
-#option		INSECURE	# insecure; allow /dev/mem writing for X
-
-maxusers	32		# estimated number of users
-option		TIMEZONE=480	# time zone to adjust RTC time by
-option		DST=0		# daylight savings time used by RTC
-option		NTP		# High precision timekeeping support
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-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		SYSVMSG		# System V-like message queues
-option		SYSVSEM		# System V-like semaphores
-option		SYSVSHM		# System V-like memory sharing
-#option		SHMMAXPGS=2048	# 2048 pages is the default
-
-option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
-option		COMPAT_10	# NetBSD 1.0,
-option		COMPAT_11	# NetBSD 1.1,
-option		COMPAT_43	# and 4.3BSD
-#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-#option		COMPAT_SVR4	# binary compatibility with SVR4
-#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-#option		COMPAT_LINUX	# binary compatibility with Linux
-option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-option		COMPAT_BSDOS	# binary compatibility with BSD/OS
-
-#option		USER_LDT	# user-settable LDT; used by WINE
-option		LKM		# loadable kernel modules
-
-option		FFS		# UFS
-#option		QUOTA		# UFS quotas
-option		MFS		# memory file system
-
-option		NFSCLIENT	# Network File System client
-option		NFSSERVER	# Network File System server
-
-#option		CD9660		# ISO 9660 + Rock Ridge file system
-option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
-option		FIFO		# FIFOs; RECOMMENDED
-option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-#option		PORTAL		# dynamically created filesystem objects
-option		PROCFS		# /proc
-#option		UMAPFS		# NULLFS + uid and gid remapping
-option		UNION		# union file system
-
-#option		GATEWAY		# packet forwarding
-option		INET		# IP + ICMP + TCP + UDP
-option		IPSEC		# IPsec
-#option		IMP		# missing files
-#option		NS		# XNS
-#option		ISO,TPIP	# OSI
-#option		EON		# OSI tunneling over IP
-#option		CCITT,LLC,HDLC	# X.25
-
-config		bsd	root on wd0a swap on wd0b dumps on wd0b
-
-mainbus0 at root
-
-isa0	at mainbus0
-pci0	at mainbus0
-
-npx0	at isa?	port 0xf0 irq 13	# math coprocessor
-isadma0	at isa?
-
-#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
-
-lpt0	at isa? port 0x378		# standard PC parallel ports
-
-joy0	at isa? port 0x201		# Game port
-
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controller
-fd*	at fdc? drive ?
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-wd*	at wdc? drive ?
-
-ep0	at isa? port ? irq ?		# 3C509 ethernet cards
-
-pseudo-device	loop		1	# network loopback
-pseudo-device	bpfilter	8	# packet filter
-pseudo-device	enc		4	# encryption device
-
-pseudo-device	pty		64	# pseudo-terminals
-pseudo-device	vnd		4	# paging to files
diff --git a/sys/arch/i386/conf/SOLO b/sys/arch/i386/conf/SOLO
new file mode 100644
index 00000000000..f37b462f2dc
--- /dev/null
+++ b/sys/arch/i386/conf/SOLO
@@ -0,0 +1,260 @@
+#
+#	SOLO -- Gateway Solo 9300cx
+#
+#	$OpenBSD: SOLO,v 1.1 2001/02/02 06:41:17 tholo Exp $
+#
+
+machine		i386		# architecture, used by config; REQUIRED
+
+option		BOOT_CONFIG	# add support for -c
+
+#option		I386_CPU	# CPU classes; at least one is REQUIRED
+#option		I486_CPU
+#option		I586_CPU
+option		I686_CPU
+#option		GPL_MATH_EMULATE	# floating point emulation
+
+option		UVM		# use the UVM virtual memory system
+
+option		PCIVERBOSE	# verbose PCI device information
+option		USBVERBOSE
+
+option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER		# diddle with console driver
+option		APERTURE
+
+#option		FFS_SOFTUPDATES	# Soft updates
+
+maxusers	32		# estimated number of users
+option		TIMEZONE=480	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
+option		NTP		# High precision timekeeping support
+#option		PPS_SYNC	# include support for PPS
+
+option		SWAPPAGER	# paging; REQUIRED
+option		DEVPAGER	# mmap() of devices
+
+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		CRYPTO		# Cryptographic framework
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=2048	# 2048 pages is the default
+
+option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
+
+#option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
+#option		COMPAT_10	# NetBSD 1.0,
+#option		COMPAT_11	# NetBSD 1.1,
+#option		COMPAT_43	# and 4.3BSD
+#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+#option		COMPAT_SVR4	# binary compatibility with SVR4
+#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+option		COMPAT_BSDOS	# binary compatibility with BSD/OS
+
+#option		USER_LDT	# user-settable LDT; used by WINE
+#option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+#option		QUOTA		# UFS quotas
+option		MFS		# memory file system
+
+option		TCP_SACK	# Selective Acknowledgements for TCP
+#option		TCP_FACK	# Forward Acknowledgements for TCP
+#option		TCP_SIGNATURE	# TCP MD5 Signatures, for BGP routing sessions
+
+option		NFSCLIENT	# Network File System client
+#option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+#option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+#option		NULLFS		# loopback file system
+#option		PORTAL		# dynamically created filesystem objects
+#option		PROCFS		# /proc
+#option		UMAPFS		# NULLFS + uid and gid remapping
+#option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		INET6		# IPv6 (needs INET)
+option		PULLDOWN_TEST	# use m_pulldown for IPv6 packet parsing
+option		IPSEC		# IPsec
+#option		KEY		# PF_KEY (implied by IPSEC)
+#option		NS		# XNS
+#option		NSIP		# XNS tunneling over IP
+#option		IPX		# IPX+SPX
+#option		IPXIP		# IPX tunneling over IP
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
+#option		IPFILTER	# IP packet filter for security
+#option		IPFILTER_LOG	# use /dev/ipl to log IPF
+option		"NMBCLUSTERS=1024"
+option		PPP_BSDCOMP
+option		PPP_DEFLATE
+#option		MROUTING	# Multicast router
+
+config		bsd	root on wd1a swap on wd1b dumps on wd1b
+
+mainbus0 at root
+
+bios0	at mainbus0
+apm0	at bios0 flags 0x0000	# flags 0x0101 to force protocol version 1.1
+pcibios0 at bios0 flags 0x0000
+
+isa0	at pcib?
+pci*	at mainbus0 bus ?
+
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
+ppb*	at pci? dev ? function ?	# PCI-PCI bridges
+pci*	at ppb? bus ?
+pcib*	at pci? dev ? function ?	# PCI-ISA bridges (do nothing)
+
+# CardBus bus support
+cardbus*	at cardslot?
+pcmcia*		at cardslot?
+cbb*		at pci? dev ? function ?
+cardslot*	at cbb?
+
+# PCI USB Controllers
+uhci*	at pci?				# Universal Host Controller (Intel)
+ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+usb*	at uhci?
+usb*	at ohci?
+
+# USB Hubs
+uhub*	at usb?
+uhub*	at uhub? port ? configuration ? interface ?
+
+# USB Generic HID devices
+uhid*	at uhub? port ? configuration ? interface ?
+
+# USB Printers
+ulpt*	at uhub? port ? configuration ? interface ?
+
+# USB Mass Storage devices
+umass*	at uhub? port ? configuration ? interface ?
+scsibus* at umass?
+
+# USB Modems
+umodem*	at uhub? port ? configuration ?
+ucom*	at umodem?
+
+# USB Audio
+uaudio* at uhub? port ? configuration ?
+
+# USB Ethernet adapters
+aue*	at uhub? port ?			# ADMtek AN986 Pegasus based adapters
+cue*	at uhub? port ?			# CATC USB-EL1201A based adapters
+kue*	at uhub? port ?			# Kawasaki KL5KUSB101B based adapters
+
+# Diamond Multimedia Rio 500
+urio*	at uhub? port ?
+
+# Handspring Visor
+uvisor*	at uhub? port ? configuration ?
+ucom*	at uvisor?
+
+# USB Scanners
+uscanner* at uhub? port ?
+
+# USB Generic driver
+ugen*	at uhub? port ? configuration ? interface ?
+
+npx0	at isa?	port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
+isapnp0	at isa?
+
+vt0	at isa? port 0x60 irq 1
+
+pcppi0	at isa?
+sysbeep0	at pcppi?
+
+pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+pccom1	at isa? port 0x2f8 irq 3	# standard PC serial ports
+
+lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+
+pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
+
+fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controller
+fd*	at fdc? drive ?
+
+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
+ss*	at scsibus? target ? lun ?	# SCSI scanners
+uk*	at scsibus? target ? lun ?	# SCSI unknown devices
+
+# IDE controllers
+pciide* at pci ? dev ? function ? flags 0x0000
+
+# IDE hard drives
+wd*	at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
+
+# Networking devices
+xl*	at pci? dev ? function ?		# 3C9xx ethernet
+xl*	at cardbus? dev ? function ?		# 3C575/3C656 ethernet
+le*	at pci? dev ? function ?		# PCnet-PCI based ethernet
+
+# Wireless network cards
+an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
+
+# Media Independent Interface (mii) drivers
+exphy*	at mii? phy ?				# 3Com internal PHYs
+ukphy*	at mii? phy ?				# "unknown" PHYs
+
+maestro* at pci? dev ? function ?		# ESS Maestro PCI
+sb0	at isa? port 0x220 irq 5 drq 1		# SoundBlaster
+
+# OPL[23] FM syntheziers
+opl*	at sb?
+
+# MIDI support
+midi*	at sb?			# SB MPU401 port
+midi*	at opl?			# OPL FM synth
+midi*	at pcppi?		# MIDI interface to the PC speaker
+
+# The spkr driver provides a simple tone interface to the built in speaker.
+spkr0	at pcppi?		# PC speaker
+
+#Audio Support
+audio*  at maestro?
+audio*  at sb?
+
+pseudo-device	loop		2	# network loopback
+pseudo-device	sequencer	1	# midi sequencer
+pseudo-device	bpfilter	8	# packet filter
+pseudo-device	sl		1	# CSLIP
+pseudo-device	ppp		1	# PPP
+pseudo-device	tun		1	# network tunneling over tty
+pseudo-device	enc		1	# encryption device
+
+pseudo-device	pty		64	# pseudo-terminals
+pseudo-device	vnd		4	# paging to files
+pseudo-device	pctr		1	# performance counters
+pseudo-device	mtrr		1	# Memory range attributes control
+pseudo-device	ksyms		1	# kernel symbols device
+
+# for IPv6
+pseudo-device	gif		4
+#pseudo-device	faith		1
+pseudo-device	gre		4	# GRE encapsulation interface