Tidying src/release/*/{dokern.sh,drivers.conf}

[Scott Long]

Ruslan Ermilov wrote:
> Perhaps somebody will find this script useful too.
> It finds missing GENERIC entries and cross-checks
> dokern.sh and drivers.conf for redundant entries.
> 
> It edits out the "SMALL" part of pc98/dokern.sh
> so as to not give false matches.
> 
> It should be run with cwd=/usr/src/release.
> 
> The patch that it "generates" is also attached.
> 

Is this an approval request?

See below...

> 
> Cheers,
> 
> 
> ------------------------------------------------------------------------
> [...]
> ------------------------------------------------------------------------
> 
> Index: release/alpha/dokern.sh
> ===================================================================
> RCS file: /home/ncvs/src/release/alpha/dokern.sh,v
> retrieving revision 1.72
> diff -u -r1.72 dokern.sh
> --- release/alpha/dokern.sh	18 May 2003 03:52:22 -0000	1.72
> +++ release/alpha/dokern.sh	18 May 2003 08:26:42 -0000
> @@ -23,7 +23,6 @@
>  	-e '/DDB/d' \
>  	-e '/INVARIANTS/d' \
>  	-e '/INVARIANT_SUPPORT/d' \
> -	-e '/WITNESS/d' \
>  	-e '/SMP/d' \
>  	-e '/	atapifd	/d' \
>  	-e '/	atapist	/d' \
> @@ -52,7 +51,6 @@
>  	-e '/	umass	/d' \
>  	-e '/	ums	/d' \
>  	-e '/	aue	/d' \
> -	-e '/	axe	/d' \
>  	-e '/	cue	/d' \
>  	-e '/	kue	/d' \
>  	-e '/	firewire	/d' \
> Index: release/pc98/dokern.sh
> ===================================================================
> RCS file: /home/ncvs/src/release/pc98/dokern.sh,v
> retrieving revision 1.76
> diff -u -r1.76 dokern.sh
> --- release/pc98/dokern.sh	18 May 2003 03:52:22 -0000	1.76
> +++ release/pc98/dokern.sh	18 May 2003 08:27:24 -0000
> @@ -33,8 +33,6 @@
>  	-e '/	pass	/d' \
>  	-e '/	ses	/d' \
>  	-e '/	splash	/d' \
> -	-e '/	apm$/d' \
> -	-e '/	pmtimer$/d' \
>  	-e '/	ppc$/d' \
>  	-e '/	ppbus	/d' \
>  	-e '/	lpt	/d' \
> @@ -98,8 +96,6 @@
>  	-e '/	pass	/d' \
>  	-e '/	ses	/d' \
>  	-e '/	splash	/d' \
> -	-e '/	apm$/d' \
> -	-e '/	pmtimer$/d' \
>  	-e '/	ppc$/d' \
>  	-e '/	ppbus	/d' \
>  	-e '/	lpt	/d' \

Can you explain why you are prososing to add these devices back to
te BOOTMFS kernel?  I assume that they were trimmed for a reason.

> Index: sys/alpha/conf/GENERIC
> ===================================================================
> RCS file: /home/ncvs/src/sys/alpha/conf/GENERIC,v
> retrieving revision 1.159
> diff -u -r1.159 GENERIC
> --- sys/alpha/conf/GENERIC	21 Apr 2003 16:44:04 -0000	1.159
> +++ sys/alpha/conf/GENERIC	18 May 2003 08:26:10 -0000
> @@ -95,6 +95,7 @@
>  # SCSI Controllers
>  device		ahc		# AHA2940 and onboard AIC7xxx devices
>  device		isp		# Qlogic family
> +device		ispfw		# Firmware module for Qlogic host adapters
>  device		mpt		# LSI-Logic MPT-Fusion
>  #device		ncr		# NCR/Symbios Logic
>  device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
> Index: sys/i386/conf/GENERIC
> ===================================================================
> RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v
> retrieving revision 1.383
> diff -u -r1.383 GENERIC
> --- sys/i386/conf/GENERIC	11 May 2003 06:39:05 -0000	1.383
> +++ sys/i386/conf/GENERIC	18 May 2003 08:26:00 -0000
> @@ -192,7 +192,9 @@
>  device		rl		# RealTek 8129/8139
>  device		sf		# Adaptec AIC-6915 (``Starfire'')
>  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
> +device		sk		# SysKonnect SK-984x and SK-982x gigabit ethernet
>  device		ste		# Sundance ST201 (D-Link DFE-550TX)
> +device		ti		# Alteon Networks Tigon I/II gigabit ethernet
>  device		tl		# Texas Instruments ThunderLAN
>  device		tx		# SMC EtherPower II (83c170 ``EPIC'')
>  device		vr		# VIA Rhine, Rhine II

Adding these three device lines is probably ok.  I spoke with Ken about
if_ti and he confirmed that there is no reason why it can't go into
GENERIC.

Scott