Module Name: src
Committed By: rin
Date: Thu Feb 7 20:56:27 UTC 2019
Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700
Log Message:
Oops, revert previous.
Combinations between NICs and PHYs are unpredictable...
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/conf/INSTALL_C700
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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.81 src/sys/arch/zaurus/conf/GENERIC:1.82
--- src/sys/arch/zaurus/conf/GENERIC:1.81 Thu Feb 7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/GENERIC Thu Feb 7 20:56:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.81 2019/02/07 20:33:44 rin Exp $
+# $NetBSD: GENERIC,v 1.82 2019/02/07 20:56:27 rin Exp $
#
# GENERIC machine description file
#
@@ -308,7 +308,6 @@ cd* at atapibus? drive ? # ATAPI CD-ROM
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
axe* at uhub? port ? # ASIX AX88172 based adapters
-axen* at uhub? port ? # ASIX AX88178a/AX88179 based adapters
cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
@@ -316,8 +315,6 @@ mue* at uhub? port ? # Microchip LAN75x
udav* at uhub? port ? # Davicom DM9601 based adapters
ure* at uhub? port ? # Realtek RTL8152/RTL8153 based adapters
url* at uhub? port ? # Realtek RTL8150L based adapters
-urndis* at uhub? port ? # Microsoft RNDIS specification
-usmsc* at uhub? port ? # SMSC95xx based adapters
# Kyocera AIR-EDGE PHONE
#ukyopon* at uhub? port ?
@@ -327,11 +324,32 @@ usmsc* at uhub? port ? # SMSC95xx base
ugen* at uhub? port ?
# MII/PHY support
+acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
+dmphy* at mii? phy ? # Davicom DM9101 PHYs
+exphy* at mii? phy ? # 3Com internal PHYs
+glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
+gphyter* at mii? phy ? # NS83861 Gig-E PHY
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+inphy* at mii? phy ? # Intel 82555 PHYs
+iophy* at mii? phy ? # Intel 82553 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+nsphy* at mii? phy ? # NS83840 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
+pnaphy* at mii? phy ? # generic HomePNA PHYs
+qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ? # Realtek 8169S/8110S/8211 PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+tlphy* at mii? phy ? # ThunderLAN PHYs
+tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+
# integrated MMC/SD contoller
pxamci0 at pxaip? addr 0x41100000 size 0x48
sdmmc* at pxamci?
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.38 src/sys/arch/zaurus/conf/INSTALL:1.39
--- src/sys/arch/zaurus/conf/INSTALL:1.38 Thu Feb 7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/INSTALL Thu Feb 7 20:56:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.38 2019/02/07 20:33:44 rin Exp $
+# $NetBSD: INSTALL,v 1.39 2019/02/07 20:56:27 rin Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -78,6 +78,16 @@ no ugen*
no uk* at scsibus?
+no acphy*
+no amhphy*
+no bmtphy*
+no glxtphy*
+no gphyter*
+no makphy*
+no tlphy*
+no tqphy*
+no urlphy*
+
no pseudo-device vnd
no options VND_COMPRESSION
no pseudo-device accf_data
Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.8 src/sys/arch/zaurus/conf/INSTALL_C700:1.9
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.8 Thu Feb 7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/INSTALL_C700 Thu Feb 7 20:56:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.8 2019/02/07 20:33:44 rin Exp $
+# $NetBSD: INSTALL_C700,v 1.9 2019/02/07 20:56:27 rin Exp $
#
# INSTALL config file (C700 with memory disk root)
#
@@ -39,7 +39,6 @@ no cd*
no aue*
no axe*
-no axen*
no cdce*
no cue*
no kue*
@@ -47,5 +46,3 @@ no mue*
no udav*
no ure*
no url*
-no urndis*
-no usmsc*
