Module Name:    src
Committed By:   thorpej
Date:           Sat Jan 25 18:38:36 UTC 2020

Modified Files:
        src/sys/arch/algor/conf: P4032 P5064
        src/sys/arch/alpha/conf: GENERIC INSTALL
        src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
        src/sys/arch/arc/conf: GENERIC MIMORI
        src/sys/arch/cats/conf: GENERIC INSTALL
        src/sys/arch/cobalt/conf: GENERIC INSTALL
        src/sys/arch/evbarm/conf: IXDP425 ZAO425
        src/sys/arch/evbmips/conf: MALTA
        src/sys/arch/evbppc/conf: PMPPC
        src/sys/arch/hppa/conf: GENERIC
        src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
            INSTALL_TINY XEN3PAE_DOM0
        src/sys/arch/macppc/conf: GENERIC
        src/sys/arch/sgimips/conf: GENERIC32_IP3x
        src/sys/arch/sparc64/conf: GENERIC

Log Message:
Retire "le* at pci?" from the shipped kernel configs:
- If the config had both an le@pci and a pcn, simply remove le@pci
  (pcn would match at a higher priority anyway).
- If the config had le@pci enabled, but no pcn, change le@pci to pcn.
- If the config had le@pci commented out, but no pcn, change le@pci
  to pcn and leave it commented out.

The pcn driver supports more chips than le@pci and does DMA directly
to/from mbufs rather than memory copies.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.399 -r1.400 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.559 -r1.560 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.172 -r1.173 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.196 -r1.197 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/arc/conf/MIMORI
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.485 -r1.486 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1222 -r1.1223 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.362 -r1.363 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.222 -r1.223 src/sys/arch/sparc64/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/algor/conf/P4032
diff -u src/sys/arch/algor/conf/P4032:1.80 src/sys/arch/algor/conf/P4032:1.81
--- src/sys/arch/algor/conf/P4032:1.80	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/algor/conf/P4032	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.80 2020/01/20 18:38:19 thorpej Exp $
+#	$NetBSD: P4032,v 1.81 2020/01/25 18:38:34 thorpej Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P4032-$Revision: 1.80 $"
+#ident 		"P4032-$Revision: 1.81 $"
 
 maxusers 32
 
@@ -137,7 +137,7 @@ pci*	at	vtpbc?
 #fxp*	at	pci? dev ? function ?		# Intel EEPRO 10+/100B
 #gsip*	at	pci? dev ? function ?		# NS DP83820 Gigabit Ethernet
 #isp*	at	pci? dev ? function ?		# Qlogic ISP 10x0 SCSI
-#le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
+#pcn*	at	pci? dev ? function ?		# PCnet-PCI Ethernet
 #pcib*	at	pci? dev ? function ?		# Intel PCI-ISA Bridges
 #siop*	at	pci? dev ? function ?		# Symbios 53c8xx SCSI
 #mlx*	at	pci? dev ? function ?		# Mylex DAC960 / DEC SWXCR (untested)

Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.91 src/sys/arch/algor/conf/P5064:1.92
--- src/sys/arch/algor/conf/P5064:1.91	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/algor/conf/P5064	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064,v 1.91 2020/01/20 18:38:19 thorpej Exp $
+#	$NetBSD: P5064,v 1.92 2020/01/25 18:38:34 thorpej Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P5064-$Revision: 1.91 $"
+#ident 		"P5064-$Revision: 1.92 $"
 
 maxusers 32
 
@@ -133,7 +133,7 @@ pci*	at	vtpbc?
 #fxp*	at	pci? dev ? function ?		# Intel EEPRO 10+/100B
 #gsip*	at	pci? dev ? function ?		# NS DP83820 Gigabit Ethernet
 #isp*	at	pci? dev ? function ?		# Qlogic ISP 10x0 SCSI
-#le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
+#pcn*	at	pci? dev ? function ?		# PCInet-PCI Ethernet
 pcib*	at	pci? dev ? function ?		# Intel PCI-ISA Bridges
 siop*	at	pci? dev ? function ?		# Symbios 53c8xx SCSI
 #mlx*	at	pci? dev ? function ?		# Mylex DAC960 / DEC SWXCR (untested)

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.399 src/sys/arch/alpha/conf/GENERIC:1.400
--- src/sys/arch/alpha/conf/GENERIC:1.399	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/alpha/conf/GENERIC	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.399 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.400 2020/01/25 18:38:34 thorpej Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.399 $"
+ident		"GENERIC-$Revision: 1.400 $"
 
 maxusers 32
 
@@ -313,7 +313,7 @@ fxp*	at	pci? dev ? function ?		# Intel E
 gsip*	at	pci? dev ? function ?		# NS DP83820 Gigabit Ethernet
 iha*	at	pci? dev ? function ?		# Initio INIC-940/950 SCSI
 isp*	at	pci? dev ? function ?		# Qlogic ISP 10x0 SCSI
-le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
+pcn*	at	pci? dev ? function ?		# PCnet-PCI Ethernet
 sf*	at	pci? dev ? function ?		# Adaptec AIC-6915 Ethernet
 siop*	at	pci? dev ? function ?		# Symbios 53c8xx SCSI
 esiop*	at	pci? dev ? function ?		# Symbios 53c875 SCSI and newer

Index: src/sys/arch/alpha/conf/INSTALL
diff -u src/sys/arch/alpha/conf/INSTALL:1.112 src/sys/arch/alpha/conf/INSTALL:1.113
--- src/sys/arch/alpha/conf/INSTALL:1.112	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/alpha/conf/INSTALL	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.112 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: INSTALL,v 1.113 2020/01/25 18:38:34 thorpej Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -191,7 +191,7 @@ fxp*	at	pci? dev ? function ?		# Intel E
 gsip*	at	pci? dev ? function ?		# NS DP83820 Gigabit Ethernet
 iha*	at	pci? dev ? function ?		# Initio INIC-940/950 SCSI
 isp*	at	pci? dev ? function ?		# Qlogic ISP 10x0 SCSI
-le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
+pcn*	at	pci? dev ? function ?		# PCnet-PCI Ethernet
 sf*	at	pci? dev ? function ?		# Adaptec AIC-6915 Ethernet
 siop*	at	pci? dev ? function ?		# Symbios 53c8xx SCSI
 mlx*	at	pci? dev ? function ?		# Mylex DAC960 / DEC SWXCR (untested)

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.141 src/sys/arch/amd64/conf/ALL:1.142
--- src/sys/arch/amd64/conf/ALL:1.141	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/amd64/conf/ALL	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.141 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: ALL,v 1.142 2020/01/25 18:38:34 thorpej Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.141 $"
+#ident		"ALL-$Revision: 1.142 $"
 
 maxusers	64		# estimated number of users
 
@@ -989,7 +989,6 @@ ixl*	at pci? dev ? function ?	# Intel Et
 ixv*	at pci? dev ? function ?	# Intel 8259x 10G virtual function
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
 hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
 mcx*	at pci? dev ? function ?	# Mellanox 5th generation Ethernet

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.559 src/sys/arch/amd64/conf/GENERIC:1.560
--- src/sys/arch/amd64/conf/GENERIC:1.559	Fri Jan 24 18:58:46 2020
+++ src/sys/arch/amd64/conf/GENERIC	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.559 2020/01/24 18:58:46 nia Exp $
+# $NetBSD: GENERIC,v 1.560 2020/01/25 18:38:34 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.559 $"
+#ident		"GENERIC-$Revision: 1.560 $"
 
 maxusers	64		# estimated number of users
 
@@ -809,7 +809,6 @@ ixl*	at pci? dev ? function ?	# Intel Et
 ixv*	at pci? dev ? function ?	# Intel 8259x 10G virtual function
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
 hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
 mcx*	at pci? dev ? function ?	# Mellanox 5th generation Ethernet

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.172 src/sys/arch/amd64/conf/XEN3_DOM0:1.173
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.172	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Sat Jan 25 18:38:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.172 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: XEN3_DOM0,v 1.173 2020/01/25 18:38:34 thorpej Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -11,7 +11,7 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOM0-$Revision: 1.172 $"
+#ident		"XEN3_DOM0-$Revision: 1.173 $"
 
 maxusers	32		# estimated number of users
 
@@ -351,7 +351,6 @@ iwn*	at pci? dev ? function ?	# Intel PR
 iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
 ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
 msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet

Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.196 src/sys/arch/arc/conf/GENERIC:1.197
--- src/sys/arch/arc/conf/GENERIC:1.196	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/arc/conf/GENERIC	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.196 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.197 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.196 $"
+#ident		"GENERIC-$Revision: 1.197 $"
 
 maxusers	32		# estimated number of users
 
@@ -323,7 +323,6 @@ ex*		at pci? dev ? function ?	# 3Com 90x
 fxp*		at pci? dev ? function ?	# Intel EtherExpress PRO
 gsip*		at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 #hme*		at pci? dev ? function ?	# Sun STP2002-STQ
-#le*		at pci? dev ? function ?	# PCnet-PCI Ethernet
 #mtd*		at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*		at pci? dev ? function ?	# NE2000-compatible
 #ntwoc*		at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial

Index: src/sys/arch/arc/conf/MIMORI
diff -u src/sys/arch/arc/conf/MIMORI:1.74 src/sys/arch/arc/conf/MIMORI:1.75
--- src/sys/arch/arc/conf/MIMORI:1.74	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/arc/conf/MIMORI	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: MIMORI,v 1.74 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: MIMORI,v 1.75 2020/01/25 18:38:35 thorpej Exp $
 #	NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #	MIMORI -- My NEC RISCstation 2250 (ur)
@@ -179,7 +179,7 @@ slide*  	at pci? dev ? function ?	# Symp
 
 ex*		at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*		at pci? dev ? function ?	# Intel EtherExpress PRO
-le*		at pci? dev ? function ?	# PCnet-PCI
+pcn*		at pci? dev ? function ?	# PCnet-PCI
 ne*		at pci? dev ? function ?	# NE2000-compatible
 tlp*		at pci? dev ? function ?	# DECchip 21x4x and clones
 

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.176 src/sys/arch/cats/conf/GENERIC:1.177
--- src/sys/arch/cats/conf/GENERIC:1.176	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/cats/conf/GENERIC	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.176 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.177 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -289,7 +289,7 @@ ep*	at pci? dev ? function ?	# 3C590 eth
 ex*	at pci? dev ? function ?	# 3Com 90x[B]
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 ne*	at pci? dev ? function ?	# NE2000 compat ethernet
 #ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 sip*	at pci? dev ? function ?	# SiS 900 Ethernet

Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.113 src/sys/arch/cats/conf/INSTALL:1.114
--- src/sys/arch/cats/conf/INSTALL:1.113	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/cats/conf/INSTALL	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.113 2020/01/20 18:38:19 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.114 2020/01/25 18:38:35 thorpej Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -235,7 +235,7 @@ ep*	at pci? dev ? function ?	# 3C590 eth
 ex*	at pci? dev ? function ?	# 3Com 90x[B]
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 ne*	at pci? dev ? function ?	# NE2000 compat ethernet
 #ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 sip*	at pci? dev ? function ?	# SiS 900 Ethernet

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.165 src/sys/arch/cobalt/conf/GENERIC:1.166
--- src/sys/arch/cobalt/conf/GENERIC:1.165	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/cobalt/conf/GENERIC	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.165 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.166 2020/01/25 18:38:35 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.165 $"
+#ident 		"GENERIC-$Revision: 1.166 $"
 
 maxusers	32
 
@@ -239,7 +239,7 @@ wd* 		at atabus? drive ? flags 0x0000
 #ex*		at pci? dev ? function ?	# 3Com 90x[BC]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #fxp*		at pci? dev ? function ?	# Intel EtherExpress PRO10+/100B
-#le*		at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*		at pci? dev ? function ?	# PCnet-PCI Ethernet
 #ne*		at pci? dev ? function ?	# NE2000-compatible Ethernet
 #ntwoc*		at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 ral*		at pci? dev ? function ?	# ralink wifi

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.73 src/sys/arch/cobalt/conf/INSTALL:1.74
--- src/sys/arch/cobalt/conf/INSTALL:1.73	Mon Jan 20 18:38:19 2020
+++ src/sys/arch/cobalt/conf/INSTALL	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.73 2020/01/20 18:38:19 thorpej Exp $
+# $NetBSD: INSTALL,v 1.74 2020/01/25 18:38:35 thorpej Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.73 $"
+#ident 		"INSTALL-$Revision: 1.74 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -229,7 +229,7 @@ wd* 		at atabus? drive ? flags 0x0000
 #ex*		at pci? dev ? function ?	# 3Com 90x[BC]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #fxp*		at pci? dev ? function ?	# Intel EtherExpress PRO10+/100B
-#le*		at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*		at pci? dev ? function ?	# PCnet-PCI Ethernet
 #ne*		at pci? dev ? function ?	# NE2000-compatible Ethernet
 #ntwoc*		at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 #sip*		at pci? dev ? function ?	# SiS 900 Ethernet

Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.58 src/sys/arch/evbarm/conf/IXDP425:1.59
--- src/sys/arch/evbarm/conf/IXDP425:1.58	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/evbarm/conf/IXDP425	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.58 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: IXDP425,v 1.59 2020/01/25 18:38:35 thorpej Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -171,7 +171,6 @@ epic*	at pci? dev ? function ?	# SMC EPI
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial

Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.66 src/sys/arch/evbarm/conf/ZAO425:1.67
--- src/sys/arch/evbarm/conf/ZAO425:1.66	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/evbarm/conf/ZAO425	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.66 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: ZAO425,v 1.67 2020/01/25 18:38:35 thorpej Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -158,7 +158,6 @@ epic*	at pci? dev ? function ?	# SMC EPI
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial

Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.99 src/sys/arch/evbmips/conf/MALTA:1.100
--- src/sys/arch/evbmips/conf/MALTA:1.99	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/evbmips/conf/MALTA	Sat Jan 25 18:38:35 2020
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.99 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: MALTA,v 1.100 2020/01/25 18:38:35 thorpej Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.99 $"
+#ident 		"MALTA-$Revision: 1.100 $"
 
 maxusers	32
 
@@ -218,7 +218,6 @@ ath*		at pci? dev ? function ?	# Atheros
 #ex*		at pci? dev ? function ?	# 3Com 90x[B]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #fxp*		at pci? dev ? function ?	# Intel EtherExpress PRO10+/100B
-#le*		at pci? dev ? function ?	# PCnet-PCI Ethernet
 pcn*		at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
 options 	PCN_EVENT_COUNTERS
 #ne*		at pci? dev ? function ?	# NE2000-compatible Ethernet

Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.52 src/sys/arch/evbppc/conf/PMPPC:1.53
--- src/sys/arch/evbppc/conf/PMPPC:1.52	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/evbppc/conf/PMPPC	Sat Jan 25 18:38:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.52 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: PMPPC,v 1.53 2020/01/25 18:38:35 thorpej Exp $
 #
 #	PMPPC
 #
@@ -233,7 +233,6 @@ ex*	at pci? dev ? function ?	# 3Com 90x[
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 #hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet

Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.30 src/sys/arch/hppa/conf/GENERIC:1.31
--- src/sys/arch/hppa/conf/GENERIC:1.30	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/hppa/conf/GENERIC	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.30 2020/01/20 18:38:20 thorpej Exp $
+# $NetBSD: GENERIC,v 1.31 2020/01/25 18:38:36 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@ include 	"arch/hppa/conf/std.hppa"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.30 $"
+#ident 		"GENERIC-$Revision: 1.31 $"
 
 maxusers	32		# estimated number of users
 
@@ -465,10 +465,8 @@ bge* 	at pci? dev ? function ?	# Broadco
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
-# fpa is broken, does funky things with bus_dma
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.485 src/sys/arch/i386/conf/ALL:1.486
--- src/sys/arch/i386/conf/ALL:1.485	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/ALL	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.485 2020/01/20 18:38:20 thorpej Exp $
+# $NetBSD: ALL,v 1.486 2020/01/25 18:38:36 thorpej Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.485 $"
+#ident		"ALL-$Revision: 1.486 $"
 
 maxusers	64		# estimated number of users
 
@@ -1069,7 +1069,6 @@ iwn*	at pci? dev ? function ?	# Intel PR
 ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
 ixl*	at pci? dev ? function ?	# Intel Ethernet 700 Series
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1222 src/sys/arch/i386/conf/GENERIC:1.1223
--- src/sys/arch/i386/conf/GENERIC:1.1222	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/GENERIC	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1222 2020/01/20 18:38:20 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1223 2020/01/25 18:38:36 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1222 $"
+#ident		"GENERIC-$Revision: 1.1223 $"
 
 maxusers	64		# estimated number of users
 
@@ -983,7 +983,6 @@ iwn*	at pci? dev ? function ?	# Intel PR
 ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
 ixl*	at pci? dev ? function ?	# Intel Ethernet 700 Series
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet

Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.166 src/sys/arch/i386/conf/GENERIC_TINY:1.167
--- src/sys/arch/i386/conf/GENERIC_TINY:1.166	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/GENERIC_TINY	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.166 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: GENERIC_TINY,v 1.167 2020/01/25 18:38:36 thorpej Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -366,7 +366,7 @@ fd*	at fdc? drive ?			# the drives thems
 #ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
 #epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 #ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 #tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
 #tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones

Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.53 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.54
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.53	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_FLOPPY,v 1.53 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: INSTALL_FLOPPY,v 1.54 2020/01/25 18:38:36 thorpej Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -487,7 +487,6 @@ gsip*	at pci? dev ? function ?	# NS83820
 #hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
 #ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
 #iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
 msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet

Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.161 src/sys/arch/i386/conf/INSTALL_TINY:1.162
--- src/sys/arch/i386/conf/INSTALL_TINY:1.161	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/INSTALL_TINY	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.161 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: INSTALL_TINY,v 1.162 2020/01/25 18:38:36 thorpej Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -382,7 +382,7 @@ fd*	at fdc? drive ?			# the drives thems
 # PCI network interfaces
 #ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
 #fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 #ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 #tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
 #tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones

Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.18 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.19
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.18	Mon Jan 20 18:38:20 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3PAE_DOM0,v 1.18 2020/01/20 18:38:20 thorpej Exp $
+#	$NetBSD: XEN3PAE_DOM0,v 1.19 2020/01/25 18:38:36 thorpej Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -331,7 +331,6 @@ iwi*	at pci? dev ? function ?	# Intel PR
 iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
 iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
 msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet

Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.362 src/sys/arch/macppc/conf/GENERIC:1.363
--- src/sys/arch/macppc/conf/GENERIC:1.362	Wed Jan 22 22:29:28 2020
+++ src/sys/arch/macppc/conf/GENERIC	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.362 2020/01/22 22:29:28 macallan Exp $
+# $NetBSD: GENERIC,v 1.363 2020/01/25 18:38:36 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.362 $"
+#ident 		"GENERIC-$Revision: 1.363 $"
 
 maxusers	32
 
@@ -207,7 +207,6 @@ fxp*	at pci? dev ? function ?	# Intel Et
 gem*	at pci? dev ? function ?	# gmac ethernet
 #gm*	at pci? dev ? function ?	# gmac ethernet (old)
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
-le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet

Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.129 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.130
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.129	Mon Jan 20 18:38:21 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.129 2020/01/20 18:38:21 thorpej Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.130 2020/01/25 18:38:36 thorpej Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entr
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.129 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.130 $"
 
 maxusers	32
 
@@ -184,7 +184,6 @@ ex*     at pci? dev ? function ?        
 fxp*    at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 gsip*   at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 #hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
-le*     at pci? dev ? function ?        # PCnet-PCI Ethernet
 mtd*    at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet
 ne*     at pci? dev ? function ?        # NE2000-compatible Ethernet
 ntwoc*  at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.222 src/sys/arch/sparc64/conf/GENERIC:1.223
--- src/sys/arch/sparc64/conf/GENERIC:1.222	Mon Jan 20 18:38:21 2020
+++ src/sys/arch/sparc64/conf/GENERIC	Sat Jan 25 18:38:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.222 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: GENERIC,v 1.223 2020/01/25 18:38:36 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.222 $"
+#ident		"GENERIC-$Revision: 1.223 $"
 
 maxusers	64
 
@@ -496,8 +496,6 @@ gem*	at pci? dev ? function ?	# Apple GM
 gem*	at sbus? slot ? offset ?
 gsip*	at pci? dev ? function ?	# National Semiconductor DP83820 GigE
 ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
-# XXX lacks bus_dmamap_sync()
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
 msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet UT

Reply via email to