[src/netbsd-1-5]: src/sys/arch/alpha/conf Pull up revision 1.134 (via patch, ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e874f699a676
branches:  netbsd-1-5
changeset: 490744:e874f699a676
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 26 22:02:14 2001 +0000

description:
Pull up revision 1.134 (via patch, requested by mjacob):
  The ``rnd'' device is now required for ssh to work, so enable it.
  Also add various other newer entries.

diffstat:

 sys/arch/alpha/conf/ALPHA |  29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diffs (90 lines):

diff -r 516fdff5adbf -r e874f699a676 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Mon Feb 26 21:55:45 2001 +0000
+++ b/sys/arch/alpha/conf/ALPHA Mon Feb 26 22:02:14 2001 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: ALPHA,v 1.127.2.2 2000/08/11 18:23:18 thorpej Exp $
+# $NetBSD: ALPHA,v 1.127.2.3 2001/02/26 22:02:14 he Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
 include        "arch/alpha/conf/std.alpha"
 
-maxusers 32
+ident          "ALPHA-$Revision: 1.127.2.3 $"
 
-ident          "ALPHA-$Revision: 1.127.2.2 $"
+maxusers 32
 
 # CPU Support
 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_500    # Flamingo etc: 3000/[4-9]00*
 options        DEC_3000_300    # Pelican etc:  3000/300*
 options        DEC_AXPPCI_33   # NoName:       AXPpci33, etc.
 options        DEC_EB164       # EB164:        AlphaPC 164
@@ -62,7 +62,7 @@
 options        QUOTA           # User and group quotas for the FFS
 options        NFSSERVER       # Sun NFS-compatible file system server
 #options       FFS_EI          # FFS Endian Independant support
-#options       SOFTDEP         # FFS soft updates support.
+options        SOFTDEP         # FFS soft updates support.
 
 # Networking options
 options        INET            # Internet protocol suite
@@ -310,6 +310,7 @@
 com*   at      isa? port 0x3f8 irq 4           # standard serial ports
 com*   at      isa? port 0x2f8 irq 3
 cs*    at      isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
+ec0    at      isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
 ep*    at      isa? port ? irq ?               # 3COM 3c509 Ethernet
 fdc0   at      isa? port 0x3f0 irq 6 drq 2     # floppy controller
 lc0    at      isa? port 0x300 iomem ? irq ?   # DEC EtherWORKS III (LEMAC)
@@ -336,6 +337,9 @@
 bha*   at      isa? port 0x334 irq ? drq ?     # BusLogic [57]4X SCSI (unt.)
 uha*   at      isa? port 0x330 irq ? drq ?     # UltraStor [13]4f SCSI (unt.)
 uha*   at      isa? port 0x334 irq ? drq ?     # UltraStor [13]4f SCSI (unt.)
+pcic0  at      isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1  at      isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000
+pcmcia*        at      pcic? controller ? socket ?
 #satlink0 at   isa? port 0x300 drq 1           # PlanetConnect Satellite receiver.
 
 # EISA devices
@@ -349,12 +353,24 @@
 le*    at      depca?
 uha*   at      eisa? slot ?                    # UltraStor 24f SCSI (unt.)
 
+# PCMCIA device
+aic*   at      pcmcia? function ?              # Adaptec APA-1460 SCSI
+com*   at      pcmcia? function ?              # Modems and serial cards
+wdc*   at      pcmcia? function ?              # PCMCIA IDE controllers
+ep*    at      pcmcia? function ?              # 3Com 3c589 and 3c562 Eth.
+mbe*   at      pcmcia? function ?              # MB8696x based Ethernet
+ne*    at      pcmcia? function ?              # NE2000-compatible Eth.
+sm*    at      pcmcia? function ?              # Megahertz Ethernet
+ray*   at      pcmcia? function ?              # Raytheon Raylink (802.11)
+wi*    at      pcmcia? function ?              # Lucent WaveLAN/IEEE
+
 # SCSI bus support
 scsibus* at    adv?
 scsibus* at    adw?
 scsibus* at    aha?
 scsibus* at    ahb?
 scsibus* at    ahc?
+scsibus* at    aic?
 scsibus* at    asc?
 scsibus* at    bha?
 scsibus* at    dpt?
@@ -459,8 +475,9 @@
 #pseudo-device gre             2       # generic L3 over IP tunnel
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
+#pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
 pseudo-device  sequencer       1       # MIDI sequencer
 
 # rnd is EXPERIMENTAL
-#pseudo-device rnd                     # /dev/random and in-kernel generator
+pseudo-device  rnd                     # /dev/random and in-kernel generator
 #options       RND_COM                 # use "com" randomness too