summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-11-25 20:47:24 +0000
committermartin <martin@NetBSD.org>2019-11-25 20:47:24 +0000
commit7ef4182bbbf40e4602e69fa317abb6850101872a (patch)
tree3fb021468091b7ac36389222137cb91f4dffd00a /sys/arch/amd64
parentaf095bdd99db8777062f74639b96dc9bd21b66fd (diff)
Pull up following revision(s) (requested by msaitoh in ticket #478):
sys/dev/mii/smscphy.c: revision 1.1 sys/arch/amd64/conf/ALL: revision 1.127 sys/arch/amd64/conf/ALL: revision 1.128 sys/dev/mii/files.mii: revision 1.52 sys/dev/mii/files.mii: revision 1.53 sys/arch/i386/conf/ALL: revision 1.473 share/man/man4/mii.4: revision 1.29 sys/arch/i386/conf/ALL: revision 1.474 sys/arch/amd64/conf/GENERIC: revision 1.543 sys/arch/amd64/conf/GENERIC: revision 1.544 sys/dev/mii/jmphyreg.h: revision 1.1 share/man/man4/Makefile: revision 1.687 share/man/man4/smscphy.4: revision 1.1 share/man/man4/Makefile: revision 1.688 sys/dev/mii/jmphy.c: revision 1.1 sys/dev/DEVNAMES: revision 1.324 sys/dev/DEVNAMES: revision 1.325 distrib/sets/lists/man/mi: revision 1.1661 sys/arch/i386/conf/GENERIC: revision 1.1214 distrib/sets/lists/man/mi: revision 1.1662 sys/arch/i386/conf/GENERIC: revision 1.1215 share/man/man4/jmphy.4: revision 1.1 share/man/man4/jme.4: revision 1.8 Add jmphy(4) from OpenBSD. Add jmphy.4. Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup and IFM_NONE support.
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/ALL6
-rw-r--r--sys/arch/amd64/conf/GENERIC6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL
index 8e49c06b9d8..3a2e9c3c3b3 100644
--- a/sys/arch/amd64/conf/ALL
+++ b/sys/arch/amd64/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.120.2.2 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: ALL,v 1.120.2.3 2019/11/25 20:47:24 martin 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.120.2.2 $"
+#ident "ALL-$Revision: 1.120.2.3 $"
maxusers 64 # estimated number of users
@@ -1105,6 +1105,7 @@ ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs
+jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
@@ -1114,6 +1115,7 @@ qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rdcphy* at mii? phy ? # RDC R6040 internal PHY
rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+smscphy* at mii? phy ? # SMSC LAN87xx PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 218717d6383..d6abcf62896 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.5 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.6 2019/11/25 20:47:24 martin 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.531.2.5 $"
+#ident "GENERIC-$Revision: 1.531.2.6 $"
maxusers 64 # estimated number of users
@@ -878,6 +878,7 @@ ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs
+jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
@@ -886,6 +887,7 @@ pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+smscphy* at mii? phy ? # SMSC LAN87xx PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs