6 files changed, 16 insertions, 8 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 2d9f415684ba..6c84ce866ba6 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.12 1998/10/30 01:37:33 jkh Exp $
+#	$Id: GENERIC,v 1.13 1998/12/29 03:59:49 gpalmer Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -22,6 +22,7 @@ maxusers	10
 # Platforms supported
 options		"DEC_AXPPCI_33"		# UDB, Multia, AXPpci33, Noname
 options		"DEC_EB164"		# EB164, PC164, PC164LX, PC164SX
+options		"DEC_EB64PLUS"		# EB64+, Aspen Alpine, etc
 options		"DEC_2100_A50"		# AlphaStation 200, 250, 255, 400
 options		"DEC_KN20AA"		# AlphaStation 500, 600
 options		"DEC_ST550"		# Personal Workstation 433, 500, 600
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 2d9f415684ba..6c84ce866ba6 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.12 1998/10/30 01:37:33 jkh Exp $
+#	$Id: GENERIC,v 1.13 1998/12/29 03:59:49 gpalmer Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -22,6 +22,7 @@ maxusers	10
 # Platforms supported
 options		"DEC_AXPPCI_33"		# UDB, Multia, AXPpci33, Noname
 options		"DEC_EB164"		# EB164, PC164, PC164LX, PC164SX
+options		"DEC_EB64PLUS"		# EB64+, Aspen Alpine, etc
 options		"DEC_2100_A50"		# AlphaStation 200, 250, 255, 400
 options		"DEC_KN20AA"		# AlphaStation 500, 600
 options		"DEC_ST550"		# Personal Workstation 433, 500, 600
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 7230d4264329..6c6d2b598bb8 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.13 1998/11/15 18:15:06 dfr Exp $
+#	$Id: files.alpha,v 1.14 1998/12/04 10:52:47 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -19,6 +19,7 @@ alpha/alpha/cpuconf.c		standard
 alpha/alpha/atomic.s		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
+alpha/alpha/dec_eb64plus.c	optional	dec_eb64plus
 alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
 alpha/alpha/dec_st550.c		optional	dec_st550
@@ -108,11 +109,12 @@ mcclock_if.h			standard				\
 	clean		"mcclock_if.h"
 alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
-alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/apecs.c		optional	apecs
+alpha/pci/pci_eb64plus_intr.s	optional	apecs
 alpha/pci/lca.c			optional	lca
 alpha/pci/pcibus.c		optional	pci
 alpha/isa/isa.c			optional	isa
+alpha/isa/mcclock_isa.c		optional	isa
 alpha/alpha/elf_machdep.c	standard
 libkern/bcd.c			standard
 libkern/bcmp.c			standard
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index a0a559057dac..44add990c1fe 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,9 +1,10 @@
-#	$Id: options.alpha,v 1.6 1998/08/21 23:43:15 gpalmer Exp $
+#	$Id: options.alpha,v 1.7 1998/09/16 08:22:09 dfr Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
 DEC_KN8AE		opt_cpu.h
 DEC_EB164		opt_cpu.h
+DEC_EB64PLUS		opt_cpu.h
 DEC_KN20AA		opt_cpu.h
 DEC_2100_A50		opt_cpu.h
 DEC_ST550		opt_cpu.h
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 7230d4264329..6c6d2b598bb8 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.13 1998/11/15 18:15:06 dfr Exp $
+#	$Id: files.alpha,v 1.14 1998/12/04 10:52:47 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -19,6 +19,7 @@ alpha/alpha/cpuconf.c		standard
 alpha/alpha/atomic.s		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
+alpha/alpha/dec_eb64plus.c	optional	dec_eb64plus
 alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
 alpha/alpha/dec_st550.c		optional	dec_st550
@@ -108,11 +109,12 @@ mcclock_if.h			standard				\
 	clean		"mcclock_if.h"
 alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
-alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/apecs.c		optional	apecs
+alpha/pci/pci_eb64plus_intr.s	optional	apecs
 alpha/pci/lca.c			optional	lca
 alpha/pci/pcibus.c		optional	pci
 alpha/isa/isa.c			optional	isa
+alpha/isa/mcclock_isa.c		optional	isa
 alpha/alpha/elf_machdep.c	standard
 libkern/bcd.c			standard
 libkern/bcmp.c			standard
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index a0a559057dac..44add990c1fe 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,9 +1,10 @@
-#	$Id: options.alpha,v 1.6 1998/08/21 23:43:15 gpalmer Exp $
+#	$Id: options.alpha,v 1.7 1998/09/16 08:22:09 dfr Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
 DEC_KN8AE		opt_cpu.h
 DEC_EB164		opt_cpu.h
+DEC_EB64PLUS		opt_cpu.h
 DEC_KN20AA		opt_cpu.h
 DEC_2100_A50		opt_cpu.h
 DEC_ST550		opt_cpu.h