Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mmeye/conf track rev. 1.36 of GENERIC:



details:   https://anonhg.NetBSD.org/src/rev/d40b6025807d
branches:  trunk
changeset: 533749:d40b6025807d
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Jul 08 22:49:01 2002 +0000

description:
track rev. 1.36 of GENERIC:
adapted to new interrupt code and shb changes.

also disable tlphy - no bus_dma, so it doesn't compile

diffstat:

 sys/arch/mmeye/conf/MMEYE      |  15 ++++++---------
 sys/arch/mmeye/conf/MMTA       |  25 +++++++++----------------
 sys/arch/mmeye/conf/MMTAICE    |  30 ++++++++----------------------
 sys/arch/mmeye/conf/MMTAROMNEW |  28 ++++++++--------------------
 4 files changed, 31 insertions(+), 67 deletions(-)

diffs (192 lines):

diff -r efa9e0f2a369 -r d40b6025807d sys/arch/mmeye/conf/MMEYE
--- a/sys/arch/mmeye/conf/MMEYE Mon Jul 08 22:48:04 2002 +0000
+++ b/sys/arch/mmeye/conf/MMEYE Mon Jul 08 22:49:01 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MMEYE,v 1.16 2002/07/08 22:14:35 jdolecek Exp $
+#      $NetBSD: MMEYE,v 1.17 2002/07/08 22:49:01 jdolecek Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -71,18 +71,15 @@
 
 shb*   at mainbus?
 
-# WatchDog Timer
-wdog0 at shb? port 0xffffff84
-
-com0   at shb? port 0xa4000000 irq 11
-com1   at shb? port 0xa4000008 irq 12
+com0   at mainbus?
+com1   at mainbus?
 
 # SH PCMCIA controllers
-shpcic0        at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1        at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
+mmeyepcmcia0   at mainbus?
+mmeyepcmcia1   at mainbus?
 
 # PCMCIA bus support
-pcmcia*        at shpcic? controller ? socket ?
+pcmcia*        at mmeyepcmcia? controller ? socket ?
 
 com*   at pcmcia? function ?           # Modems and serial cards
 wdc*   at pcmcia? function ?
diff -r efa9e0f2a369 -r d40b6025807d sys/arch/mmeye/conf/MMTA
--- a/sys/arch/mmeye/conf/MMTA  Mon Jul 08 22:48:04 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTA  Mon Jul 08 22:49:01 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MMTA,v 1.17 2002/07/08 22:14:35 jdolecek Exp $
+#      $NetBSD: MMTA,v 1.18 2002/07/08 22:49:01 jdolecek Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -116,27 +116,20 @@
 
 shb* at mainbus?
 
-# Basic Bus Support
+com0   at mainbus?
+com1   at mainbus?
+
+# SH PCMCIA controllers
+mmeyepcmcia0   at mainbus?
+mmeyepcmcia1   at mainbus?
 
 # PCMCIA bus support
-pcmcia*        at shpcic? controller ? socket ?
-#pcmcia*       at shb?
-
-# SH PCMCIA controllers
-shpcic0        at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1        at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
-
+pcmcia*        at mmeyepcmcia? controller ? socket ?
 
 # Console Devices
 
 # XXX
 
-
-# Serial Devices
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
-
 # PCMCIA serial interfaces
 com*   at pcmcia? function ?           # Modems and serial cards
 
@@ -190,7 +183,7 @@
 nsphy* at mii? phy ?                   # NS83840 PHYs
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
 sqphy* at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ?                   # ThunderLAN PHYs
+#tlphy*        at mii? phy ?                   # ThunderLAN PHYs
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 
diff -r efa9e0f2a369 -r d40b6025807d sys/arch/mmeye/conf/MMTAICE
--- a/sys/arch/mmeye/conf/MMTAICE       Mon Jul 08 22:48:04 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTAICE       Mon Jul 08 22:49:01 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MMTAICE,v 1.17 2002/07/08 22:14:35 jdolecek Exp $
+#      $NetBSD: MMTAICE,v 1.18 2002/07/08 22:49:02 jdolecek Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -146,29 +146,15 @@
 
 shb* at mainbus?
 
-#apm0  at mainbus0                     # Advanced power management
-
-
-# Basic Bus Support
-
-# PCMCIA bus support
-pcmcia*        at shpcic? controller ? socket ?
-#pcmcia*       at shb?
+com0   at mainbus?
+com1   at mainbus?
 
 # SH PCMCIA controllers
-shpcic0        at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1        at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
-
-
-# Console Devices
+mmeyepcmcia0   at mainbus?
+mmeyepcmcia1   at mainbus?
 
-# XXX
-
-
-# Serial Devices
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
+# PCMCIA bus support
+pcmcia*        at mmeyepcmcia? controller ? socket ?
 
 # PCMCIA serial interfaces
 com*   at pcmcia? function ?           # Modems and serial cards
@@ -223,7 +209,7 @@
 nsphy* at mii? phy ?                   # NS83840 PHYs
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
 sqphy* at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ?                   # ThunderLAN PHYs
+#tlphy*        at mii? phy ?                   # ThunderLAN PHYs
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 
diff -r efa9e0f2a369 -r d40b6025807d sys/arch/mmeye/conf/MMTAROMNEW
--- a/sys/arch/mmeye/conf/MMTAROMNEW    Mon Jul 08 22:48:04 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTAROMNEW    Mon Jul 08 22:49:01 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MMTAROMNEW,v 1.17 2002/07/08 22:14:35 jdolecek Exp $
+#      $NetBSD: MMTAROMNEW,v 1.18 2002/07/08 22:49:02 jdolecek Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -125,27 +125,15 @@
 
 shb* at mainbus?
 
-#apm0  at mainbus0                     # Advanced power management
-
-
-# Basic Bus Support
-
-# PCMCIA bus support
-pcmcia*        at shpcic? controller ? socket ?
-#pcmcia*       at shb?
+com0   at mainbus?
+com1   at mainbus?
 
 # SH PCMCIA controllers
-shpcic0        at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1        at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
-
-# Console Devices
+mmeyepcmcia0   at mainbus?
+mmeyepcmcia1   at mainbus?
 
-# XXX
-
-# Serial Devices
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
+# PCMCIA bus support
+pcmcia*        at mmeyepcmcia? controller ? socket ?
 
 # PCMCIA serial interfaces
 #com*  at pcmcia? function ?           # Modems and serial cards
@@ -199,7 +187,7 @@
 nsphy* at mii? phy ?                   # NS83840 PHYs
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
 sqphy* at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ?                   # ThunderLAN PHYs
+#tlphy*        at mii? phy ?                   # ThunderLAN PHYs
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 



Home | Main Index | Thread Index | Old Index