From owner-cvs-all Fri Jan 25 19:31: 4 2002 Delivered-To: cvs-all@freebsd.org Received: from cs23.catv.ne.jp (cs23.catv.ne.jp [202.232.171.43]) by hub.freebsd.org (Postfix) with ESMTP id 953CA37B404; Fri, 25 Jan 2002 19:30:47 -0800 (PST) Received: from cs0.catv.ne.jp by cs23.catv.ne.jp (8.9.1/3.7W) id MAA01035; Sat, 26 Jan 2002 12:31:29 +0900 (JST) Received: from sakura.ccs.furiru.org by cs0.catv.ne.jp (8.9.1/3.7W) id MAA22619; Sat, 26 Jan 2002 12:30:42 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sakura.ccs.furiru.org (8.11.6/8.11.6) with ESMTP id g0Q3UhL94848; Sat, 26 Jan 2002 12:30:44 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Sat, 26 Jan 2002 12:30:30 +0900 (JST) Message-Id: <20020126.123030.21906216.nyan@jp.FreeBSD.org> To: murray@FreeBSD.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, nyan@jp.FreeBSD.org Subject: Re: cvs commit: src/release/scripts dokern.sh src/release/i386 drivers.conf src/sys/i386/conf GENERIC From: Takahashi Yoshihiro In-Reply-To: <200201251741.g0PHfeF75818@freefall.freebsd.org> References: <200201251741.g0PHfeF75818@freefall.freebsd.org> X-Mailer: Mew version 2.2rc1 on Emacs 21.1 / Mule 5.0 =?iso-2022-jp?B?KBskQjgtTFobKEIp?= Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Sat_Jan_26_12:30:30_2002_736)--" Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG ----Next_Part(Sat_Jan_26_12:30:30_2002_736)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, In article <200201251741.g0PHfeF75818@freefall.freebsd.org> Murray Stokely writes: > murray 2002/01/25 09:41:40 PST > > Modified files: (Branch: RELENG_4) > release/scripts dokern.sh > release/i386 drivers.conf > sys/i386/conf GENERIC > Log: > There is still room on the MFSROOT floppy for i386. Add 'bge' to > kern.flp and move if_txp.ko over to mfsroot.flp. > > Tested on: 4.5-RC3 > Approved by: rwatson This change does NOT remove the txp driver from BOOTMFS. There is a typo. I have made a patch to fix this problem. The patch includes changes for pc98. It should be in RELENG_4 and RELENG_4_5 branches. Thank you. --- Takahashi Yoshihiro The Center for Information Science, Kogakuin Univ. ----Next_Part(Sat_Jan_26_12:30:30_2002_736)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bge.diff" Index: src/release/pc98/drivers.conf =================================================================== RCS file: /home/ncvs/src/release/pc98/drivers.conf,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 drivers.conf --- src/release/pc98/drivers.conf 19 Jan 2002 11:26:04 -0000 1.1.2.1 +++ src/release/pc98/drivers.conf 26 Jan 2002 03:06:13 -0000 @@ -37,3 +37,4 @@ #drv filename floppy type description an if_an 2 network "Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card" wi if_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" +txp if_txp 2 network "3Com 3cR990 (``Typhoon'') PCI Ethernet" Index: src/release/scripts/dokern.sh =================================================================== RCS file: /home/ncvs/src/release/scripts/Attic/dokern.sh,v retrieving revision 1.23.2.26 diff -u -r1.23.2.26 dokern.sh --- src/release/scripts/dokern.sh 25 Jan 2002 17:41:39 -0000 1.23.2.26 +++ src/release/scripts/dokern.sh 26 Jan 2002 03:10:16 -0000 @@ -38,9 +38,10 @@ -e '/ vr/d' \ -e '/ wb/d' \ -e '/ xl/d' \ + -e '/ txp/d' \ + -e '/ bge/d' \ -e '/ an$/d' \ -e '/ wi$/d' \ - -e '/ txp$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ @@ -89,9 +90,9 @@ -e '/NFS_ROOT/d' \ -e '/RANDOMDEV/d' \ -e '/ ncr/d' \ + -e '/ txp/d' \ -e '/ an$/d' \ -e '/ wi$/d' \ - -e '/ txp$/d' \ -e '/atapist/d' \ -e '/lpt/d' \ -e '/ppi/d' \ Index: src/sys/pc98/conf/GENERIC =================================================================== RCS file: /home/ncvs/src/sys/pc98/conf/GENERIC,v retrieving revision 1.142.2.27 diff -u -r1.142.2.27 GENERIC --- src/sys/pc98/conf/GENERIC 19 Dec 2001 18:34:53 -0000 1.142.2.27 +++ src/sys/pc98/conf/GENERIC 26 Jan 2002 03:12:23 -0000 @@ -226,6 +226,7 @@ device wb # Winbond W89C840F device wx # Intel Gigabit Ethernet Card (``Wiseman'') device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') +device bge # Broadcom BCM570x (``Tigon III'') # ISA Ethernet NICs. # ----Next_Part(Sat_Jan_26_12:30:30_2002_736)---- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message