shorter better BABY

1 files changed, 6 insertions, 208 deletions

diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index fe5e633c773..fe00cbc5629 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,210 +1,8 @@
-#	$OpenBSD: BABY,v 1.38 1998/09/11 11:26:23 fgsch Exp $
+#	$OpenBSD: BABY,v 1.39 1998/11/10 23:48:35 deraadt Exp $
+#	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
+#
+#	GENERIC -- everything that's currently supported
+#
 
-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		VM86		# Virtual 8086 emulation
-
-# Some BIOSes don't get the size of extended memory right.  If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option		EXTMEM_SIZE=... # size of extended memory
+include		"../../../arch/i386/conf/GENERIC"
 option		BUFCACHEPERCENT=30
-
-#option		DUMMY_NOPS	# speed hack; recommended
-#option		XSERVER		# diddle with console driver
-#option		INSECURE	# insecure; allow /dev/mem writing for X
-
-maxusers	64		# estimated number of users
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight savings time used by RTC
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-option		DDB		# in-kernel debugger
-makeoptions	DEBUG="-g"	# compile full symbol table
-option		DIAGNOSTIC	# internal 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=1024	# 1024 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		"NMBCLUSTERS=1024"
-option		GATEWAY		# packet forwarding
-option		INET		# IP + ICMP + TCP + UDP
-option		IPSEC		# IPsec
-option		NS		# XNS
-#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
-
-config		bsd	root on sd0 swap on sd0 and sd1 and sd2 and sd3 and sd4 dumps on sd2
-
-mainbus0 at root
-
-bios0	at mainbus0
-apm0	at bios0
-
-isa0	at mainbus0
-eisa0	at mainbus0
-pci*	at mainbus0 bus ?
-
-option		PCIVERBOSE
-option		EISAVERBOSE
-
-pchb*	at pci? dev ? function ?	# PCI-Host bridges
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-pci*	at ppb? bus ?
-pci*	at pchb? bus ?
-
-# ISA PCMCIA controllers
-pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
-pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
-
-# PCMCIA bus support
-pcmcia*	at pcic? controller ? socket ?
-
-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
-
-pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-pccom1	at isa? port 0x2f8 irq 3
-pccom2	at isa? port 0x3e8 irq 5
-#pccom3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#pccom*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#pccom*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#pccom*	at rtfps? slave ?
-pccom*	at pcmcia? function ?		# PCMCIA modem cards
-
-#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 pckbd? 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?
-ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
-ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI controllers
-ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
-ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
-aic0	at isa? port 0x340 irq 11	# 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 0x308 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
-ep*	at isa? port ? irq ?			# 3C509 ethernet cards
-#ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-#ie1	at isa? port 0x300 irq 10		# EtherExpress
-le0	at isa? port 0x360 irq 15 drq 6		# IsoLan, NE2100, and DEPCA
-ep*	at eisa? slot ?				# 3C579 ethernet cards
-#fea*	at eisa? slot ?				# DEC DEFEA FDDI cards
-#le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
-de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
-ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-#ed*	at pcmcia? function ?			# PCMCIA based ed cards
-#ep*	at pcmcia? function ?			# PCMCIA based ep cards
-#fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
-
-#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 (record drq for full-duplex)
-#aria0	at isa? port 0x280 irq 10 flags 1	# Prometheus/Aria 16
-#spkr0	at pckbd? port 0x61
-
-# Joystick driver. Probe is a little strange; add only if you have one.
-#joy0	at isa? port 0x201
-
-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	vnd	4		# paging to files
-pseudo-device	ccd	4		# concatenated disk devices
-pseudo-device	enc	4		# encryption device
-pseudo-device	pctr	1
-pseudo-device	ksyms	1		# kernel symbols device