summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha/conf')
-rw-r--r--sys/arch/alpha/conf/GENERIC20
-rw-r--r--sys/arch/alpha/conf/RAMDISK4
-rw-r--r--sys/arch/alpha/conf/RAMDISKB4
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG12
-rw-r--r--sys/arch/alpha/conf/files.alpha47
5 files changed, 39 insertions, 48 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index e6ed538b0be..0554e38ec4d 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.105 2002/04/26 20:13:11 matthieu Exp $
+# $OpenBSD: GENERIC,v 1.106 2002/05/02 22:56:06 miod Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
machine alpha
@@ -82,24 +82,24 @@ ugen* at uhub? port ? configuration ? # USB Generic driver
# EV6 Tsunami Core Logic
tsc* at mainbus0
-# TurboChannel host bus adapter support
+# TURBOchannel host bus adapter support
tcasic* at mainbus0
-# TurboChannel bus support
+# TURBOchannel bus support
tc* at tcasic?
-# TurboChannel devices
+# TURBOchannel devices
ioasic* at tc? slot ? offset ?
mcclock* at ioasic? offset ?
le* at ioasic? offset ?
scc0 at ioasic? offset ?
scc1 at ioasic? offset ?
-tcds0 at tc? slot ? offset ?
-asc0 at tcds? slot ?
-asc1 at tcds? slot ?
+tcds* at tc? slot ? offset ?
+asc* at tcds? chip ?
scsibus* at asc?
-cfb* at tc? slot ? offset ?
-sfb* at tc? slot ? offset ?
+asc* at tc? slot ? offset ?
+#cfb* at tc? slot ? offset ?
+#sfb* at tc? slot ? offset ?
le* at tc? slot ? offset ?
fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
@@ -298,8 +298,8 @@ audio* at uaudio?
# Workstation Console attachments
#wsdisplay* at cfb?
-wsdisplay* at vga?
#wsdisplay* at sfb?
+#wsdisplay* at vga?
wsdisplay* at tga?
wskbd* at pckbd?
wsmouse* at pms?
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 231d1c8a513..45fb5915704 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.56 2002/04/28 20:55:14 pvalchev Exp $
+# $OpenBSD: RAMDISK,v 1.57 2002/05/02 22:56:06 miod Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -137,9 +137,7 @@ sd* at scsibus? target ? lun ? # SCSI disk drives
#st* at scsibus? target ? lun ? # SCSI tape drives
# Workstation Console attachments
-#wsdisplay* at cfb?
wsdisplay* at vga?
-#wsdisplay* at sfb?
wsdisplay* at tga?
wskbd* at pckbd?
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index d32a646f415..93e37dcd853 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.19 2002/04/28 20:55:14 pvalchev Exp $
+# $OpenBSD: RAMDISKB,v 1.20 2002/05/02 22:56:06 miod Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -138,9 +138,7 @@ sd* at scsibus? target ? lun ? # SCSI disk drives
#st* at scsibus? target ? lun ? # SCSI tape drives
# Workstation Console attachments
-#wsdisplay* at cfb?
wsdisplay* at vga?
-#wsdisplay* at sfb?
wsdisplay* at tga?
wskbd* at pckbd?
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index fc4d1cba8c2..c77a5faddfe 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.25 2002/04/28 20:55:14 pvalchev Exp $
+# $OpenBSD: RAMDISKBIG,v 1.26 2002/05/02 22:56:06 miod Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -102,12 +102,12 @@ mcclock* at ioasic? offset ?
le* at ioasic? offset ?
scc0 at ioasic? offset ?
scc1 at ioasic? offset ?
-tcds0 at tc? slot ? offset ?
-asc0 at tcds? slot ?
-asc1 at tcds? slot ?
+tcds* at tc? slot ? offset ?
+asc* at tcds? chip ?
+asc* at tc? slot ? offset ?
scsibus* at asc?
-cfb* at tc? slot ? offset ?
-sfb* at tc? slot ? offset ?
+#cfb* at tc? slot ? offset ?
+#sfb* at tc? slot ? offset ?
le* at tc? slot ? offset ?
fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 5249e2ecadd..8d6c26e4f3c 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: files.alpha,v 1.57 2002/04/28 20:55:14 pvalchev Exp $
+# $OpenBSD: files.alpha,v 1.58 2002/05/02 22:56:06 miod Exp $
# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
#
# alpha-specific configuration info
@@ -60,55 +60,50 @@ include "dev/wsfont/files.wsfont"
include "dev/wscons/files.wscons"
#
-# TurboChannel Devices
+# Bus-independent support for DEC devices
+#
+include "dev/dec/files.dec"
+
+#
+# TURBOchannel Devices
#
include "dev/tc/files.tc"
+# TC attachment is MD
+attach tc at tcbus
+
device tcasic: tcbus
attach tcasic at mainbus
file arch/alpha/tc/tcasic.c tcasic
file arch/alpha/tc/tc_bus_mem.c tcasic
+file arch/alpha/tc/tc_dma.c tcasic
+file arch/alpha/tc/tc_dma_3000_300.c tcasic & dec_3000_300
+file arch/alpha/tc/tc_dma_3000_500.c tcasic & dec_3000_500
+file arch/alpha/tc/tc_sgmap.c tcasic & dec_3000_500
file arch/alpha/tc/tc_3000_500.c tcasic & dec_3000_500
file arch/alpha/tc/tc_3000_300.c tcasic & dec_3000_300
-# the TurboChannel IOCTL ASIC
-device ioasic { offset = -1 }
-attach ioasic at tc
+# the TURBOchannel IOCTL ASIC
+# IOASIC device and attachment defined in sys/dev/tc/files.tc
file arch/alpha/tc/ioasic.c ioasic
-# Color Frame buffer
+# PMAG-B CX
device cfb: wsemuldisplaydev, wsrasteremulops
attach cfb at tc
-file arch/alpha/tc/cfb.c cfb
+file arch/alpha/tc/cfb.c cfb needs-flag
-# Smart Frame buffer
+# PMAGB-B HX or CXT
device sfb: wsemuldisplaydev, wsrasteremulops
attach sfb at tc
-file arch/alpha/tc/sfb.c sfb
+file arch/alpha/tc/sfb.c sfb needs-flag
# 8530 UARTs
device scc
attach scc at ioasic
file arch/alpha/tc/scc.c scc needs-count
-# the TCDS ASIC
-device tcds { slot = -1 }
-attach tcds at tc
-file arch/alpha/tc/tcds.c tcds needs-count
-
-# 53C[F]90 SCSI
-device asc: scsi
-attach asc at tcds
-file arch/alpha/tc/asc.c asc needs-count
-file arch/alpha/tc/tcds_dma.c asc
-
-# Baseboard Lance ethernet.
-attach le at ioasic with le_ioasic
-attach le at tc with le_tc
-file dev/tc/if_le_dec.c (le_ioasic | le_tc)
-file dev/tc/if_le_ioasic.c le_ioasic needs-flag #for le_iomem
-file dev/tc/if_le_tc.c le_tc
+# TC and baseboard ioasic Lance ethernet are in files.tc
#
# ISA Bus support