Source-Changes-HG archive

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

[src/netbsd-1-5]: src/sys/arch/alpha/conf Update from trunk:



details:   https://anonhg.NetBSD.org/src/rev/60ee4eaf3a2f
branches:  netbsd-1-5
changeset: 488470:60ee4eaf3a2f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 12 21:04:17 2000 +0000

description:
Update from trunk:
- Add Jensen support/devices.
- Add commented-out Sable/Lynx support/devices.
- Switch from `ncr' to `siop' by default.
- Add some missing `scsibus' configs to INSTALL.

diffstat:

 sys/arch/alpha/conf/ALPHA   |  34 +++++++++++++++++++++++++++++-----
 sys/arch/alpha/conf/GENERIC |  34 +++++++++++++++++++++++++++++-----
 sys/arch/alpha/conf/INSTALL |  37 +++++++++++++++++++++++++++++++++----
 3 files changed, 91 insertions(+), 14 deletions(-)

diffs (289 lines):

diff -r e376a6952225 -r 60ee4eaf3a2f sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Wed Jul 12 21:03:02 2000 +0000
+++ b/sys/arch/alpha/conf/ALPHA Wed Jul 12 21:04:17 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.127 2000/06/14 22:02:13 veego Exp $
+# $NetBSD: ALPHA,v 1.127.2.1 2000/07/12 21:04:17 thorpej Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
@@ -6,12 +6,14 @@
 
 maxusers 32
 
-ident          "ALPHA-$Revision: 1.127 $"
+ident          "ALPHA-$Revision: 1.127.2.1 $"
 
 # CPU Support
-#options       DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
+options        DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
 options        DEC_2100_A50    # Avanti etc:   AlphaStation 400, 200, etc.
 options        DEC_3000_500    # Flamingo etc: 3000/[4-9]00*
+#options       DEC_2100_A500   # Sable:        AlphaServer 2100
+#options       DEC_2100A_A500  # Lynx:         AlphaServer 2100A
 options        DEC_3000_300    # Pelican etc:  3000/300*
 options        DEC_AXPPCI_33   # NoName:       AXPpci33, etc.
 options        DEC_EB164       # EB164:        AlphaPC 164
@@ -161,6 +163,14 @@
 
 tsc*   at      mainbus0
 
+# DECpc AXP150 (Jensen) internal bus support
+jensenio* at   mainbus0
+
+com*   at      jensenio? port ?
+lpt*   at      jensenio? port ?
+mcclock* at    jensenio? port ?
+pckbc* at      jensenio? port ?
+
 # TurboChannel host bus adapter support
 tcasic*        at      mainbus0
 
@@ -190,6 +200,15 @@
 dwlpx* at      kft?
 mcpcia*        at      mcbus? mid ?
 tsp*   at      tsc?
+#ttwoga*       at      mainbus?
+
+# Sable PCI and STDIO bus and devices
+#ttwopci* at   ttwoga? hose ?  
+#sableio* at   ttwopci? bus ?  
+#com*  at      sableio? port ? 
+#lpt*  at      sableio? port ? 
+#pckbc*        at      sableio? port ? 
+#fdc*  at      sableio? port ? 
 
 # PCI bus support
 pci*   at      apecs?
@@ -200,6 +219,7 @@
 pci*   at      dwlpx?
 pci*   at      mcpcia?
 pci*   at      tsp?
+#pci*  at      ttwopci?
 
 # PCI devices
 adv*   at      pci? dev ? function ?           # AdvanSys SCSI
@@ -225,7 +245,8 @@
 fxp*   at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
 le*    at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 ne*    at      pci? dev ? function ?           # NE2000-compatible Ethernet
 ohci*  at      pci? dev ? function ?           # USB Open Host Controller
 pceb*  at      pci? dev ? function ?           # Intel PCI-EISA Bridges
@@ -272,6 +293,8 @@
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 # ISA/EISA bus support
+isa*   at      jensenio?
+eisa*  at      jensenio?
 isa*   at      pceb?
 eisa*  at      pceb?
 isa*   at      sio?
@@ -334,7 +357,8 @@
 scsibus* at    bha?
 scsibus* at    dpt?
 scsibus* at    isp?
-scsibus* at    ncr?
+#scsibus* at   ncr?
+scsibus* at    siop?
 scsibus* at    pcscp?
 scsibus* at    uha?
 
diff -r e376a6952225 -r 60ee4eaf3a2f sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Wed Jul 12 21:03:02 2000 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Wed Jul 12 21:04:17 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.157.2.1 2000/06/23 14:36:06 fvdl Exp $
+# $NetBSD: GENERIC,v 1.157.2.2 2000/07/12 21:04:17 thorpej Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #
@@ -6,13 +6,15 @@
 
 include        "arch/alpha/conf/std.alpha"
 
-#ident                 "GENERIC-$Revision: 1.157.2.1 $"
+#ident                 "GENERIC-$Revision: 1.157.2.2 $"
 
 maxusers 32
 
 # CPU Support
-#options       DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
+options        DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
 options        DEC_2100_A50    # Avanti etc:   AlphaStation 400, 200, etc.
+#options       DEC_2100_A500   # Sable:        AlphaServer 2100
+#options       DEC_2100A_A500  # Lynx:         AlphaServer 2100A
 options        DEC_3000_500    # Flamingo etc: 3000/[4-9]00*
 options        DEC_3000_300    # Pelican etc:  3000/300*
 options        DEC_AXPPCI_33   # NoName:       AXPpci33, etc.
@@ -135,6 +137,14 @@
 
 tsc*   at      mainbus0
 
+# DECpc AXP150 (Jensen) internal bus support
+jensenio* at   mainbus0
+
+com*   at      jensenio? port ?
+lpt*   at      jensenio? port ?
+mcclock* at    jensenio? port ?
+pckbc* at      jensenio? port ?
+
 # TurboChannel host bus adapter support
 tcasic*        at      mainbus0
 
@@ -162,6 +172,15 @@
 dwlpx* at      kft?
 mcpcia*        at      mcbus? mid ?
 tsp*   at      tsc?
+#ttwoga*       at      mainbus?
+
+# Sable PCI and STDIO bus and devices
+#ttwopci* at   ttwoga? hose ?  
+#sableio* at   ttwopci? bus ?  
+#com*  at      sableio? port ? 
+#lpt*  at      sableio? port ? 
+#pckbc*        at      sableio? port ? 
+#fdc*  at      sableio? port ?
 
 # PCI bus support
 pci*   at      apecs?
@@ -172,6 +191,7 @@
 pci*   at      dwlpx?
 pci*   at      mcpcia?
 pci*   at      tsp?
+#pci*  at      ttwopci?
 
 # PCI devices
 adv*   at      pci? dev ? function ?           # AdvanSys SCSI
@@ -196,7 +216,8 @@
 fxp*   at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
 le*    at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 ne*    at      pci? dev ? function ?           # NE2000-compatible Ethernet
 ohci*  at      pci? dev ? function ?           # USB Open Host Controller
 pceb*  at      pci? dev ? function ?           # Intel PCI-EISA Bridges
@@ -240,6 +261,8 @@
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 # ISA/EISA bus support
+isa*   at      jensenio?
+eisa*  at      jensenio?
 isa*   at      pceb?
 eisa*  at      pceb?
 isa*   at      sio?
@@ -316,7 +339,8 @@
 scsibus* at    bha?
 scsibus* at    dpt?
 scsibus* at    isp?
-scsibus* at    ncr?
+#scsibus* at   ncr?
+scsibus* at    siop?
 scsibus* at    pcscp?
 scsibus* at    uha?
 
diff -r e376a6952225 -r 60ee4eaf3a2f sys/arch/alpha/conf/INSTALL
--- a/sys/arch/alpha/conf/INSTALL       Wed Jul 12 21:03:02 2000 +0000
+++ b/sys/arch/alpha/conf/INSTALL       Wed Jul 12 21:04:17 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.39 2000/06/01 20:30:30 thorpej Exp $
+# $NetBSD: INSTALL,v 1.39.2.1 2000/07/12 21:04:18 thorpej Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -15,8 +15,10 @@
 options        MINIROOTSIZE=9300       # 4 Megabytes
 
 # CPU Support
-#options       DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
+options        DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
 options        DEC_2100_A50    # Avanti etc:   AlphaStation 400, 200, etc.
+#options       DEC_2100_A500   # Sable:        AlphaServer 2100
+#options       DEC_2100A_A500  # Lynx:         AlphaServer 2100A
 options        DEC_3000_500    # Flamingo etc: 3000/[4-9]00*
 options        DEC_3000_300    # Pelican etc:  3000/300*
 options        DEC_AXPPCI_33   # NoName:       AXPpci33, Multia, etc.
@@ -94,6 +96,14 @@
 
 tsc*   at      mainbus0
 
+# DECpc AXP150 (Jensen) internal bus support
+jensenio* at   mainbus0
+
+com*   at      jensenio? port ?
+lpt*   at      jensenio? port ?
+mcclock* at    jensenio? port ?
+pckbc* at      jensenio? port ?
+
 # TurboChannel host bus adapter support
 tcasic*        at      mainbus0
 
@@ -119,6 +129,15 @@
 dwlpx* at      kft?
 mcpcia*        at      mcbus? mid ?
 tsp*   at      tsc?
+#ttwoga*       at      mainbus?
+
+# Sable PCI and STDIO bus and devices
+#ttwopci* at   ttwoga? hose ?  
+#sableio* at   ttwopci? bus ?  
+#com*  at      sableio? port ? 
+#lpt*  at      sableio? port ? 
+#pckbc*        at      sableio? port ? 
+#fdc*  at      sableio? port ?
 
 # PCI bus support
 pci*   at      apecs?
@@ -129,6 +148,7 @@
 pci*   at      dwlpx?
 pci*   at      mcpcia?
 pci*   at      tsp?
+#pci*  at      ttwopci?
 
 # PCI devices
 adv*   at      pci? dev ? function ?           # AdvanSys SCSI
@@ -149,7 +169,8 @@
 fxp*   at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
 le*    at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 ne*    at      pci? dev ? function ?           # NE2000-compatible Ethernet
 pceb*  at      pci? dev ? function ?           # Intel PCI-EISA Bridges
 pciide*        at      pci? dev ? function ?           # PCI IDE controllers
@@ -180,6 +201,8 @@
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 # ISA/EISA bus support
+isa*   at      jensenio?
+eisa*  at      jensenio?
 isa*   at      pceb?
 eisa*  at      pceb?
 isa*   at      sio?
@@ -213,13 +236,19 @@
 
 # SCSI bus support
 scsibus* at    adv?
+#scsibus* at   aic?
 scsibus* at    adw?
+#scsibus* at   aha?
+scsibus* at    ahb?
 scsibus* at    ahc?
 scsibus* at    asc?
 scsibus* at    bha?
 scsibus* at    dpt?
 scsibus* at    isp?
-scsibus* at    ncr?
+#scsibus* at   ncr?
+scsibus* at    siop?
+scsibus* at    pcscp?
+scsibus* at    uha?
 
 # SCSI devices
 cd*    at      scsibus? target ? lun ?         # SCSI CD-ROM drives



Home | Main Index | Thread Index | Old Index