Module Name: src
Committed By: phx
Date: Fri Feb 1 14:48:16 UTC 2013
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
Log Message:
Include two MII PHY drivers, as needed by certain PCMCIA network cards.
More PHY drivers should be added when needed.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/amiga/conf/INSTALL
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/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.164 src/sys/arch/amiga/conf/DRACO:1.165
--- src/sys/arch/amiga/conf/DRACO:1.164 Tue Jan 29 21:06:15 2013
+++ src/sys/arch/amiga/conf/DRACO Fri Feb 1 14:48:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.164 2013/01/29 21:06:15 rkujawa Exp $
+# $NetBSD: DRACO,v 1.165 2013/02/01 14:48:15 phx Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.164 $"
+#ident "GENERIC-$Revision: 1.165 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.296 src/sys/arch/amiga/conf/GENERIC:1.297
--- src/sys/arch/amiga/conf/GENERIC:1.296 Tue Jan 29 21:06:16 2013
+++ src/sys/arch/amiga/conf/GENERIC Fri Feb 1 14:48:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.296 2013/01/29 21:06:16 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.297 2013/02/01 14:48:15 phx Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.296 $"
+#ident "GENERIC-$Revision: 1.297 $"
maxusers 8
@@ -456,19 +456,21 @@ sd* at atapibus? drive ? # ATAPI disk d
pccard0 at mainbus0
pcmcia* at pccard0
-com* at pcmcia? function ? # Modems and serial cards
-pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
-aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
+com* at pcmcia? function ? # Modems and serial cards
+pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
wdc* at pcmcia? function ?
-awi* at pcmcia? function ? # BayStack 650 (802.11FH)
-ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
-mbe* at pcmcia? function ? # MB8696x based Ethernet
-ne* at pcmcia? function ? # NE2000-compatible Ethernet
-sm* at pcmcia? function ? # Megahertz Ethernet
+awi* at pcmcia? function ? # BayStack 650 (802.11FH)
+ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+mbe* at pcmcia? function ? # MB8696x based Ethernet
+ne* at pcmcia? function ? # NE2000-compatible Ethernet
+sm* at pcmcia? function ? # Megahertz Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
com* at mhzc?
sm* at mhzc?
+nsphyter* at mii? phy ? # NS83843 PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
drsc0 at mainbus0 # DraCo scsi
scsibus* at drsc0
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.110 src/sys/arch/amiga/conf/GENERIC.in:1.111
--- src/sys/arch/amiga/conf/GENERIC.in:1.110 Tue Jan 29 21:04:55 2013
+++ src/sys/arch/amiga/conf/GENERIC.in Fri Feb 1 14:48:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.110 2013/01/29 21:04:55 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.111 2013/02/01 14:48:15 phx Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.110 $"
+#ident "GENERIC-$Revision: 1.111 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -537,19 +537,21 @@ sd* at atapibus? drive ? # ATAPI disk d
pccard0 at mainbus0
pcmcia* at pccard0
-com* at pcmcia? function ? # Modems and serial cards
-pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
-aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
+com* at pcmcia? function ? # Modems and serial cards
+pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
wdc* at pcmcia? function ?
-awi* at pcmcia? function ? # BayStack 650 (802.11FH)
-ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
-mbe* at pcmcia? function ? # MB8696x based Ethernet
-ne* at pcmcia? function ? # NE2000-compatible Ethernet
-sm* at pcmcia? function ? # Megahertz Ethernet
+awi* at pcmcia? function ? # BayStack 650 (802.11FH)
+ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+mbe* at pcmcia? function ? # MB8696x based Ethernet
+ne* at pcmcia? function ? # NE2000-compatible Ethernet
+sm* at pcmcia? function ? # Megahertz Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
com* at mhzc?
sm* at mhzc?
+nsphyter* at mii? phy ? # NS83843 PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
')m4_dnl
m4_ifdef(`DRACO_CONFIGURATION', `m4_dnl
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.115 src/sys/arch/amiga/conf/INSTALL:1.116
--- src/sys/arch/amiga/conf/INSTALL:1.115 Tue Jan 29 21:06:16 2013
+++ src/sys/arch/amiga/conf/INSTALL Fri Feb 1 14:48:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.115 2013/01/29 21:06:16 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.116 2013/02/01 14:48:15 phx Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.115 $"
+#ident "GENERIC-$Revision: 1.116 $"
makeoptions COPTS="-Os"
@@ -397,19 +397,21 @@ sd* at atapibus? drive ? # ATAPI disk d
pccard0 at mainbus0
pcmcia* at pccard0
-com* at pcmcia? function ? # Modems and serial cards
-pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
-aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
+com* at pcmcia? function ? # Modems and serial cards
+pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
wdc* at pcmcia? function ?
-awi* at pcmcia? function ? # BayStack 650 (802.11FH)
-ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
-mbe* at pcmcia? function ? # MB8696x based Ethernet
-ne* at pcmcia? function ? # NE2000-compatible Ethernet
-sm* at pcmcia? function ? # Megahertz Ethernet
+awi* at pcmcia? function ? # BayStack 650 (802.11FH)
+ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+mbe* at pcmcia? function ? # MB8696x based Ethernet
+ne* at pcmcia? function ? # NE2000-compatible Ethernet
+sm* at pcmcia? function ? # Megahertz Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
com* at mhzc?
sm* at mhzc?
+nsphyter* at mii? phy ? # NS83843 PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
drsc0 at mainbus0 # DraCo scsi
scsibus* at drsc0
