cleanup a lot

3 files changed, 19 insertions, 14 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 33b871c12c0..cdb75ed8a10 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.75 2001/04/21 20:19:27 aaron Exp $
+#	$OpenBSD: GENERIC,v 1.76 2001/05/14 03:10:26 deraadt 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.
@@ -130,10 +130,8 @@ ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
 isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
-ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old)
-scsibus* at ncr?
-#siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI (new)
-#scsibus* at siop?
+siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI
+scsibus* at siop?
 
 #UNTESTED: the following three drivers are untested.
 adw*	at pci? dev ? function ?	# AdvanSys ULTRA WIDE SCSI
@@ -293,8 +291,8 @@ wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
 # crypto support
-#BROKEN: The following two drivers are broken because of 64-bit issues.
-#hifn*	at pci? dev ? function ?	# Hi/fn 7751 crypto card
+hifn*	at pci? dev ? function ?	# Hi/fn 7751 crypto card
 #ubsec*	at pci? dev ? function ?	# Bluesteel Networks 5xxx crypto card
 
 #pseudo-device	raid		4	# RAIDframe disk driver
+pseudo-device	crypto		1
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 239763944c4..8033f873068 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.6 2001/04/16 03:19:52 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.7 2001/05/14 03:10:26 deraadt Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -7,7 +7,14 @@ option		UVM		# required
 option		PMAP_NEW	# required
 
 # CPU Support; at least one is REQUIRED
-option          DEC_550		# Miata:	Digital Personal Workstation
+#option		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
+#option		DEC_3000_300	# Pelican etc:	3000/300*
+#option		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
+#option		DEC_KN20AA	# KN20AA:	AlphaStation 600
+#option		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
+#option		DEC_EB164	# EB164:	AlphaPC 164
+#option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
+#option		DEC_550		# Miata:	Digital Personal Workstation
 option		DEC_6600	# EV6:		264DP OEM Board
 option		API_UP1000	# EV6:		Alpha Processor UP1000
 
@@ -64,7 +71,7 @@ de*	at	pci? dev ? function ?		# 21x4[012]-based Ethernet
 #xl*	at	pci? dev ? function ?		# 3COM 3c9xx (untested)
 #fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI cards
 #le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
-ncr*	at	pci? dev ? function ?		# NCR 53c8xx SCSI
+siop*	at	pci? dev ? function ?		# NCR 53c8xx SCSI
 pceb*	at	pci? dev ? function ?		# Intel PCI-EISA brige
 vga*	at	pci? dev ? function ?		# PCI VGA graphics
 ppb*	at	pci? dev ? function ?		# PCI-PCI bridges
@@ -117,7 +124,7 @@ wd*	at pciide? channel ? drive ? flags 0x0000
 
 # SCSI bus support
 #scsibus* at	asc?
-scsibus* at	ncr?
+scsibus* at	siop?
 scsibus* at	isp?
 
 # SCSI devices
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index ee5a42925cc..24b0674735b 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.10 2001/04/16 04:08:22 deraadt Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.11 2001/05/14 03:10:26 deraadt 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.
@@ -141,8 +141,8 @@ ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
 isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
-ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
-scsibus* at ncr?
+siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI
+scsibus* at siop?
 
 #UNTESTED: the following three drivers are untested.
 adw*	at pci? dev ? function ?	# AdvanSys ULTRA WIDE SCSI