4 files changed, 52 insertions, 12 deletions

diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index acbbef96d69b..396d707fb354 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.2 1998/06/14 13:45:06 dfr Exp $
+#	$Id: files.alpha,v 1.3 1998/07/12 16:26:52 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -18,6 +18,7 @@ alpha/alpha/autoconf.c		standard	device-driver
 alpha/alpha/cpuconf.c		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
+alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
@@ -66,8 +67,8 @@ alpha/tlsb/kftxx.c		optional	kft
 alpha/tlsb/mcclock_tlsb.c	optional	gbus
 alpha/tlsb/zs_tlsb.c		optional	gbus
 alpha/tlsb/dwlpx.c		optional	dwlpx
-dev/dec/mcclock.c		optional	gbus
-dev/dec/mcclock_if.m		optional	gbus				\
+dev/dec/mcclock.c		standard
+dev/dec/mcclock_if.m		standard				\
 	dependency	"$S/kern/makedevops.sh"					\
 	clean		"mcclock_if.c"
 mcclock_if.h			standard					\ 
@@ -79,6 +80,7 @@ alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
 alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/pcibus.c		optional	pci
+alpha/isa/isa.c			optional	isa
 kern/link_elf.c			standard
 kern/subr_bus.c			standard
 kern/device_if.m		standard					\
@@ -118,5 +120,6 @@ libkern/alpha/htons.S		standard
 libkern/alpha/ntohl.S		standard
 libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
-
-
+isa/kbdio.c			optional        psm     device-driver
+isa/kbdio.c			optional        sc      device-driver
+isa/syscons.c			optional	sc	device-driver
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index d43633107b1b..f626ca22e569 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,8 +1,9 @@
-#	$Id: options.alpha,v 1.1 1998/06/10 10:54:14 dfr Exp $
+#	$Id: options.alpha,v 1.2 1998/07/12 16:28:09 dfr Exp $
 
 EV5			opt_global.h
 DEC_KN8AE		opt_cpu.h
 DEC_EB164		opt_cpu.h
+DEC_KN20AA		opt_cpu.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h
@@ -17,3 +18,19 @@ AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
 AHC_ALLOW_MEMIO		opt_aic7xxx.h
 AHC_SHARE_SCBS		opt_aic7xxx.h
 
+SC_SPLASH_SCREEN	opt_syscons.h
+MAXCONS			opt_syscons.h
+SLOW_VGA		opt_syscons.h
+STD8X16FONT		opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
+SC_DISABLE_REBOOT	opt_syscons.h
+SC_MOUSE_CHAR		opt_syscons.h
+
+PSM_HOOKAPM		opt_psm.h
+PSM_RESETAFTERSUSPEND	opt_psm.h
+PSM_DEBUG		opt_psm.h
+
+KBD_RESETDELAY		opt_kbdio.h
+KBD_MAXRETRY		opt_kbdio.h
+KBD_MAXWAIT		opt_kbdio.h
+KBDIO_DEBUG		opt_kbdio.h
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index acbbef96d69b..396d707fb354 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.2 1998/06/14 13:45:06 dfr Exp $
+#	$Id: files.alpha,v 1.3 1998/07/12 16:26:52 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -18,6 +18,7 @@ alpha/alpha/autoconf.c		standard	device-driver
 alpha/alpha/cpuconf.c		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
+alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
@@ -66,8 +67,8 @@ alpha/tlsb/kftxx.c		optional	kft
 alpha/tlsb/mcclock_tlsb.c	optional	gbus
 alpha/tlsb/zs_tlsb.c		optional	gbus
 alpha/tlsb/dwlpx.c		optional	dwlpx
-dev/dec/mcclock.c		optional	gbus
-dev/dec/mcclock_if.m		optional	gbus				\
+dev/dec/mcclock.c		standard
+dev/dec/mcclock_if.m		standard				\
 	dependency	"$S/kern/makedevops.sh"					\
 	clean		"mcclock_if.c"
 mcclock_if.h			standard					\ 
@@ -79,6 +80,7 @@ alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
 alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/pcibus.c		optional	pci
+alpha/isa/isa.c			optional	isa
 kern/link_elf.c			standard
 kern/subr_bus.c			standard
 kern/device_if.m		standard					\
@@ -118,5 +120,6 @@ libkern/alpha/htons.S		standard
 libkern/alpha/ntohl.S		standard
 libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
-
-
+isa/kbdio.c			optional        psm     device-driver
+isa/kbdio.c			optional        sc      device-driver
+isa/syscons.c			optional	sc	device-driver
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index d43633107b1b..f626ca22e569 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,8 +1,9 @@
-#	$Id: options.alpha,v 1.1 1998/06/10 10:54:14 dfr Exp $
+#	$Id: options.alpha,v 1.2 1998/07/12 16:28:09 dfr Exp $
 
 EV5			opt_global.h
 DEC_KN8AE		opt_cpu.h
 DEC_EB164		opt_cpu.h
+DEC_KN20AA		opt_cpu.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h
@@ -17,3 +18,19 @@ AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
 AHC_ALLOW_MEMIO		opt_aic7xxx.h
 AHC_SHARE_SCBS		opt_aic7xxx.h
 
+SC_SPLASH_SCREEN	opt_syscons.h
+MAXCONS			opt_syscons.h
+SLOW_VGA		opt_syscons.h
+STD8X16FONT		opt_syscons.h
+SC_HISTORY_SIZE		opt_syscons.h
+SC_DISABLE_REBOOT	opt_syscons.h
+SC_MOUSE_CHAR		opt_syscons.h
+
+PSM_HOOKAPM		opt_psm.h
+PSM_RESETAFTERSUSPEND	opt_psm.h
+PSM_DEBUG		opt_psm.h
+
+KBD_RESETDELAY		opt_kbdio.h
+KBD_MAXRETRY		opt_kbdio.h
+KBD_MAXWAIT		opt_kbdio.h
+KBDIO_DEBUG		opt_kbdio.h