add mii and if_gm ethernet.

diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
index b148cdd..844c961 100644 (file)
--- a/sys/arch/powerpc/conf/GENERICMAC
+++ b/sys/arch/powerpc/conf/GENERICMAC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERICMAC,v 1.5 2000/03/20 07:14:59 rahnds Exp $
+#      $OpenBSD: GENERICMAC,v 1.6 2000/03/23 04:08:12 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -54,11 +54,25 @@ de*         at pci? dev ? function ?
 #macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
 
-#nsphy*  at mii? phy ?                   # NS83840 PHYs   
+# how many of these are needed?
+exphy*  at mii? phy ?                   # 3Com internal PHYs
+inphy*  at mii? phy ?                   # Intel 82555 PHYs
+iophy*  at mii? phy ?                   # Intel 82553 PHYs
+icsphy* at mii? phy ?                   # Integrated Circuit Systems ICS1890
+#lxtphy* at mii? phy ?                   # Level One LXT-970 PHYs
+nsphy*  at mii? phy ?                   # NS83840 PHYs
+#nsphyter* at mii? phy ?                 # NS83843 PHYs
+#qsphy*  at mii? phy ?                   # Quality Semiconductor QS6612 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
+
 
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
+gm*     at obio?                        # gmac ethernet  G4 
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
@@ -87,7 +101,6 @@ wdc*    at obio? flags 0x0
 wd*     at wdc? drive ? flags 0x0000
 
 atapiscsi* at wdc? channel ? flags 0x0000
-#atapibus* at wdc? 
 
 # ATAPI<->SCSI
 scsibus* at atapiscsi?

diff --git a/sys/arch/powerpc/conf/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
index 0dd3738..3c8aee9 100644 (file)
--- a/sys/arch/powerpc/conf/RAMDISKMAC
+++ b/sys/arch/powerpc/conf/RAMDISKMAC
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISKMAC,v 1.5 2000/03/20 07:14:59 rahnds Exp $
+#      $OpenBSD: RAMDISKMAC,v 1.6 2000/03/23 04:08:12 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -24,11 +24,11 @@ option              DEVPAGER        # mmap() of devices
 option         COMPAT_43       # and 4.3BSD
 option         FFS             # UFS
 option         MFS             # memory file system
-option         NFSCLIENT       # Network File System client
 option         CD9660          # ISO 9660 + Rock Ridge file system
 option         MSDOSFS         # MS-DOS file system
 option         KERNFS          # /kern
 option         INET            # IP + ICMP + TCP + UDP
+option         DDB             # IP + ICMP + TCP + UDP
 pseudo-device  loop    2       # network loopback
 pseudo-device  pty     64      # pseudo-terminals
 #pseudo-device ccd     4       # concatenated disk devices
@@ -70,6 +70,20 @@ de*          at pci? dev ? function ?
 #macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
 
+# how many of these are needed?
+exphy*  at mii? phy ?                   # 3Com internal PHYs
+inphy*  at mii? phy ?                   # Intel 82555 PHYs
+iophy*  at mii? phy ?                   # Intel 82553 PHYs
+icsphy* at mii? phy ?                   # Integrated Circuit Systems ICS1890
+#lxtphy* at mii? phy ?                   # Level One LXT-970 PHYs
+nsphy*  at mii? phy ?                   # NS83840 PHYs
+#nsphyter* at mii? phy ?                 # NS83843 PHYs
+#qsphy*  at mii? phy ?                   # Quality Semiconductor QS6612 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
+
 # PCI USB Controllers
 #uhci* at pci?                         # Universal Host Controller (Intel)
 #ohci* at pci?                         # Open Host Controller
@@ -78,11 +92,10 @@ obio0   at pci? dev ? function ?
 #usb*  at uhci?
 #usb*  at ohci?
 
-#nsphy*  at mii? phy ?                   # NS83840 PHYs   
-
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
+gm*     at obio?                        # gmac ethernet  G4 
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
@@ -112,7 +125,6 @@ wdc*        at obio? flags 0x0
 wd*     at wdc? drive ? flags 0x0000
 
 atapiscsi* at wdc? channel ? flags 0x0000
-#atapiscsi* at wdc? 
 
 # ATAPI<->SCSI
 scsibus* at atapiscsi?

diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index f152111..630c258 100644 (file)
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -42,6 +42,11 @@ file    arch/powerpc/powerpc/db_trace.c                 ddb
 
 file    arch/powerpc/powerpc/ofwreal.S
 
+#
+# Media Indepedent Interface (mii)
+#
+include "../../../dev/mii/files.mii"
+
 #
 # MAC generic
 #
@@ -156,6 +161,10 @@ device bm: ether, ifnet, ifmedia
 attach bm at obio
 file arch/powerpc/mac/if_bm.c                  bm
 
+device gm: ether, ifnet, ifmedia, mii
+attach gm at obio
+file arch/powerpc/mac/if_gm.c                  gm
+
 device macintr {}
 attach macintr at obio
 file   arch/powerpc/mac/macintr.c              macintr