head	1.7;
access;
symbols
	RELENG_3_0_0_RELEASE:1.3;
locks; strict;
comment	@# @;


1.7
date	98.12.27.13.12.59;	author phk;	state dead;
branches;
next	1.6;

1.6
date	98.10.22.13.49.51;	author bde;	state Exp;
branches;
next	1.5;

1.5
date	98.10.22.12.23.04;	author bde;	state Exp;
branches;
next	1.4;

1.4
date	98.10.18.16.24.32;	author wpaul;	state Exp;
branches;
next	1.3;

1.3
date	98.09.22.11.13.14;	author jb;	state Exp;
branches;
next	1.2;

1.2
date	98.09.16.17.44.37;	author phk;	state Exp;
branches;
next	1.1;

1.1
date	98.08.30.03.06.23;	author jb;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Add commented out SMP stuff in GENERIC, remove stale configs.
@
text
@#
# GENERICupgrade (a copy of GENERIC)
#
# This config file is used by the aout->elf transition build on systems
# not running a 3.0-CURRENT kernel. Unless a kernel is built and installed
# as part of the upgrade, the system will be hosed by the installation
# of the 3.0 binaries and subsequent reboot. If the transition build is
# being perfomed on a machine for which this config file is inappropriate,
# it should be replaced with a suitable one prior to performing the upgrade.
#
#	$Id: GENERICupgrade,v 1.6 1998/10/22 13:49:51 bde Exp $

machine		"i386"
cpu		"I386_CPU"
cpu		"I486_CPU"
cpu		"I586_CPU"
cpu		"I686_CPU"
ident		GENERIC
maxusers	32

options		MATH_EMULATE		#Support for x87 emulation
options		INET			#InterNETworking
options		FFS			#Berkeley Fast Filesystem
options		NFS			#Network Filesystem
options		MSDOSFS			#MSDOS Filesystem
options		"CD9660"		#ISO 9660 Filesystem
options		"CD9660_ROOT"		#CD-ROM usable as root device
options		FFS_ROOT		#FFS usable as root device [keep this!]
options		NFS_ROOT		#NFS usable as root device
options		PROCFS			#Process filesystem
options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
options		UCONSOLE		#Allow users to grab the console
options		FAILSAFE		#Be conservative
options		USERCONFIG		#boot -c editor
options		VISUAL_USERCONFIG	#visual boot -c editor

config		kernel	root on wd0

controller	isa0
controller	eisa0
controller	pci0

controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
disk		fd0	at fdc0 drive 0
disk		fd1	at fdc0 drive 1
# Unless you know very well what you're doing, leave ft0 at drive 2, or
# remove the line entirely if you don't need it.  Trying to configure
# it on another unit might cause surprises, see PR kern/7176.
tape		ft0	at fdc0 drive 2

options		"CMD640"	# work around CMD640 chip deficiency
controller	wdc0	at isa? port "IO_WD1" bio irq 14
disk		wd0	at wdc0 drive 0
disk		wd1	at wdc0 drive 1

controller	wdc1	at isa? port "IO_WD2" bio irq 15
disk		wd2	at wdc1 drive 0
disk		wd3	at wdc1 drive 1

options		ATAPI		#Enable ATAPI support for IDE bus
options		ATAPI_STATIC	#Don't do it as an LKM
device		wcd0		#IDE CD-ROM
device		wfd0		#IDE Floppy (e.g. LS-120)

# A single entry for any of these controllers (ncr, ahb, ahc, amd) is
# sufficient for any number of installed devices.
controller	ncr0
#controller	amd0
controller	ahb0
controller	ahc0
controller	isp0

# This controller offers a number of configuration options, too many to
# document here  - see the LINT file in this directory and look up the
# dpt0 entry there for much fuller documentation on this.  The options
# line following dpt0 here is also currently a *required* option for it.
# controller      dpt0
# options DPT_MEASURE_PERFORMANCE

controller	adv0	at isa? port ? cam irq ?
controller	bt0	at isa? port ? cam irq ?
controller	aha0	at isa? port ? cam irq ?
#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5
#controller	aic0	at isa? port 0x340 bio irq 11
#controller	nca0	at isa? port 0x1f88 bio irq 10
#controller	nca1	at isa? port 0x350 bio irq 5
#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000

controller	scbus0

device		da0

device		sa0

device		pass0

device		cd0	#Only need one of these, the code dynamically grows

device		wt0	at isa? port 0x300 bio irq 5 drq 1
device		mcd0	at isa? port 0x300 bio irq 10

controller	matcd0	at isa? port 0x230 bio

device		scd0	at isa? port 0x230 bio

# syscons is the default console driver, resembling an SCO console
device		sc0	at isa? port IO_KBD conflicts tty irq 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
#device		vt0	at isa? port IO_KBD conflicts tty irq 1
#options		XSERVER			# support for X server
#options		FAT_CURSOR		# start with block cursor
# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
#options		PCVT_SCANSET=2		# IBM keyboards are non-std

device		npx0	at isa? port IO_NPX irq 13

#
# Laptop support (see LINT for more options)
#
device		apm0    at isa?	disable	flags 0x31 # Advanced Power Management

# PCCARD (PCMCIA) support
#controller	card0
#device		pcic0	at card?
#device		pcic1	at card?

device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
device		sio1	at isa? port "IO_COM2" tty irq 3
device		sio2	at isa? disable port "IO_COM3" tty irq 5
device		sio3	at isa? disable port "IO_COM4" tty irq 9

device		lpt0	at isa? port? tty irq 7
device		lpt1	at isa? port? tty
device		mse0	at isa? port 0x23c tty irq 5

device		psm0	at isa? port IO_KBD conflicts tty irq 12

# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
# Right now it appears that the ie0 must be probed before ep0. See
# revision 1.20 of this file.
device de0
device fxp0
device rl0
device tl0
device tx0
device vx0
device xl0

device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000
device ep0 at isa? port 0x300 net irq 10
device ex0 at isa? port? net irq?
device fe0 at isa? port 0x300 net irq ?
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
device lnc0 at isa? port 0x280 net irq 10 drq 0
device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000
device cs0 at isa? port 0x300 net irq ?

pseudo-device	loop
pseudo-device	ether
pseudo-device	sl	1
pseudo-device	ppp	1
pseudo-device	tun	1
pseudo-device	pty	16
pseudo-device	gzip		# Exec gzipped a.out's

# KTRACE enables the system-call tracing facility ktrace(2).
# This adds 4 KB bloat to your kernel, and slightly increases
# the costs of each syscall.
options		KTRACE		#kernel tracing

# This provides support for System V shared memory.
#
options		SYSVSHM
@


1.6
log
@Quote port names that have a digit in them.  IO_TIMER1 was lexed as
{ port_name = "IO_TIMER", port_number = 1 } and only worked because
it was reassembled to "IO_TIMER1".  Trailing digits always work, but
this is too magic to depend on.

Don't quote port names that don't have a digit in them.
@
text
@d11 1
a11 1
#	$Id: GENERICupgrade,v 1.5 1998/10/22 12:23:04 bde Exp $
@


1.5
log
@Removed all `vector xxxintr' specifications.  Interrupt handlers are now
configured in drivers.
@
text
@d11 1
a11 1
#	$Id: GENERICupgrade,v 1.4 1998/10/18 16:24:32 wpaul Exp $
d108 1
a108 1
device		sc0	at isa? port "IO_KBD" conflicts tty irq 1
d110 1
a110 1
#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1
d116 1
a116 1
device		npx0	at isa? port "IO_NPX" irq 13
d137 1
a137 1
device		psm0	at isa? port "IO_KBD" conflicts tty irq 12
@


1.4
log
@Add driver support for PCI fast ethernet adapters based on the
RealTek 8129/8139 chipset like I've been threatening. Update kernel
configs, userconfig.c, relnotes and sysinstall. No man page yet;
comming soon.

I consider this driver stable enough that I want to give it some
exposure in -current.
@
text
@d11 1
a11 1
#	$Id: GENERICupgrade,v 1.3 1998/09/22 11:13:14 jb Exp $
d44 1
a44 1
controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
d53 1
a53 1
controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
d57 1
a57 1
controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
d84 5
a88 5
#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
d100 2
a101 2
device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
d108 1
a108 1
device		sc0	at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
d110 1
a110 1
#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
d116 1
a116 1
device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
d128 4
a131 4
device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr
device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
d133 1
a133 1
device		lpt0	at isa? port? tty irq 7 vector lptintr
d135 1
a135 1
device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
d137 1
a137 1
device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
d151 10
a160 10
device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
device ep0 at isa? port 0x300 net irq 10 vector epintr
device ex0 at isa? port? net irq? vector exintr
device fe0 at isa? port 0x300 net irq ? vector feintr
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
device cs0 at isa? port 0x300 net irq ? vector csintr
@


1.3
log
@Post C-day sync with GENERIC.
@
text
@d11 1
a11 1
#	$Id: GENERICupgrade,v 1.2 1998/09/16 17:44:37 phk Exp $
d145 1
@


1.2
log
@Make this somewhat cam-compatible.

Justin, can you take a peek please ?
@
text
@d11 1
a11 1
#	$Id: GENERICupgrade,v 1.1 1998/08/30 03:06:23 jb Exp $
d19 1
a19 1
maxusers	10
a32 1
options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
d69 1
a69 1
controller	amd0
d78 2
a79 2
controller      dpt0
options DPT_MEASURE_PERFORMANCE
d81 8
a88 7
controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
d96 2
d108 1
a108 1
device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
d110 1
a110 1
#device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
@


1.1
log
@The aout->elf transition build from a 2.2.5/6/7 system requires that
a kernel be built and installed at just the right time. If the system
were to be rebooted after installing the 3.0 binaries without the
new kernel, the system is hosed.

The addition of this config file reserves the name of the config file
that the upgrade procedure uses. If an upgrade is to be performed on
a 2.2.5/6/7 system system for which a GENERIC kernel is inadequate,
this config file must be replace with a suitable one before performing
the upgrade.

On systems which report 'uname -r' as 3.0-CURRENT, the kernel build
is not performed and this file is ignored.
@
text
@d11 1
a11 1
#	$Id$
d32 1
a32 1
options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
d92 1
a92 1
device		sd0
d94 1
a94 3
device		od0	#See LINT for possible `od' options.

device		st0
@
