Kill mac68k *SBC kernels. Instead, build kernels with both sbc scsi flavours

compiled in, but one disabled, and use config -e to swap them and build
the other kernels; saves valuable compile time.

Add ramdisks into the build (at release time). Since we are moving to a
bsd.rd installation, it is not necessary to put kernels in .tgz files
anymore, so don't bother, and adjust installation script sets information
accordingly.

4 files changed, 8 insertions, 153 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 89a6f57c9ce..ec8b7d4f35b 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.36 2004/12/02 20:17:49 miod Exp $
+#	$OpenBSD: GENERIC,v 1.37 2004/12/03 06:37:51 miod Exp $
 #	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
 #
 # GENERIC - an all-in-one kernel for the mac68k
@@ -48,13 +48,13 @@ grf*		at macvid?
 # Attach ite semantics to the appropriate grf device
 ite0		at grf?
 
-# Use only one of ncrscsi or sbc
+# Enable only one of ncrscsi or sbc
 ncrscsi0	at obio?		# SCSI NCR 5380
-#sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
+sbc0		at obio? disable flags 0x1	# MI NCR 5380 SCSI Bus Controller
 
 scsibus*	at esp?
 scsibus*	at ncrscsi?
-#scsibus*	at sbc?
+scsibus*	at sbc?
 
 sd*	at scsibus?		# SCSI disk drives
 st*	at scsibus?		# SCSI tape drives
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
deleted file mode 100644
index cb7bd1126fe..00000000000
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ /dev/null
@@ -1,64 +0,0 @@
-#	$OpenBSD: GENERICSBC,v 1.20 2004/12/02 20:17:49 miod Exp $
-#	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
-#
-# GENERICSBC --- our generic kernel using the SBC SCSI driver
-
-machine	mac68k m68k
-include "conf/GENERIC"
-
-# Mac-specific options
-option		HZ=60		# Macs like 60Hz
-option		M68040
-option		M68030
-option		M68020		# Must have 68851 PMMU
-option		FPSP
-option		FPU_EMULATE
-option		COMPAT_SUNOS	# SunOS m68k binary compatibility
-option		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#option		MRG_ADB		  # Use ROM-based ADB driver
-
-config		bsd	swap generic
-maxusers	32
-
-mainbus0 at root
-
-# on-board I/O
-obio0 at mainbus?
-
-adb0	at obio?
-asc0	at obio?		# ASC/EASC audio
-esp0	at obio?		# SCSI NCR 53C9x
-esp1	at obio?		# SCSI NCR 53C9x
-intvid0	at obio?		# Internal video hardware
-mc*	at obio?		# MACE ethernet on Centris/Quadra 660av
-sn*	at obio?		# Internal ethernet
-zsc0	at obio?		# Zilog serial chip
-zstty*	at zsc?
-
-nubus0		at mainbus?
-
-ae*		at nubus?	# Most Apple Ethernet Cards
-macvid*		at nubus?	# NuBus video cards
-sn*		at nubus?	# SONIC-based ethernet cards
-
-# Attach grf semantics to all video hardware as it is found
-grf*		at intvid?
-grf*		at macvid?
-
-# Attach ite semantics to the appropriate grf device
-ite0		at grf?
-
-# Use only one of ncrscsi or sbc
-#ncrscsi0	at obio?		# SCSI NCR 5380
-sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
-
-scsibus*	at esp?
-#scsibus*	at ncrscsi?
-scsibus*	at sbc?
-
-sd*	at scsibus?		# SCSI disk drives
-st*	at scsibus?		# SCSI tape drives
-cd*	at scsibus?		# SCSI CD-ROM drives
-ch*	at scsibus?		# SCSI autochangers
-ss*	at scsibus?		# SCSI scanners
-uk*	at scsibus?		# SCSI unknown
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index 909ce4b6083..5c63de1e5ff 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.15 2004/12/02 20:17:49 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.16 2004/12/03 06:37:51 miod Exp $
 #
 # RAMDISK - bsd.rd configuration file (non-SBC version)
 
@@ -66,13 +66,13 @@ grf*		at macvid?
 # Attach ite semantics to the appropriate grf device
 ite0		at grf?
 
-# Use only one of ncrscsi or sbc
+# Enable only one of ncrscsi or sbc
 ncrscsi0	at obio?		# SCSI NCR 5380
-#sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
+sbc0		at obio? disable flags 0x1	# MI NCR 5380 SCSI Bus Controller
 
 scsibus*	at esp?
 scsibus*	at ncrscsi?
-#scsibus*	at sbc?
+scsibus*	at sbc?
 
 sd*	at scsibus?		# SCSI disk drives
 st*	at scsibus?		# SCSI tape drives
diff --git a/sys/arch/mac68k/conf/RAMDISKSBC b/sys/arch/mac68k/conf/RAMDISKSBC
deleted file mode 100644
index 69210048a21..00000000000
--- a/sys/arch/mac68k/conf/RAMDISKSBC
+++ /dev/null
@@ -1,81 +0,0 @@
-#	$OpenBSD: RAMDISKSBC,v 1.6 2004/12/02 20:17:49 miod Exp $
-#
-# RAMDISKSBC - bsd.rd configuration file (SBC version)
-
-machine		mac68k m68k
-
-# 1.4 meg ramdisk
-option		MINIROOTSIZE=2880
-option		RAMDISK_HOOKS
-
-option		SCSITERSE
-option		SMALL_KERNEL
-option		NO_PROPOLICE
-option		TIMEZONE=0
-option		DST=0
-option		FFS		# UFS
-option		NFSCLIENT	# Network File System client
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FIFO		# FIFOs; RECOMMENDED
-option		INET		# IP + ICMP + TCP + UDP
-
-pseudo-device	loop	1	# network loopback
-pseudo-device	bpfilter 1	# packet filter
-
-# Comment out until UKC can be invoked on mac68k...
-#option		BOOT_CONFIG	# add support for boot -c
-option		DDB
-
-# Mac-specific options
-option		HZ=60		# Macs like 60Hz
-option		M68040
-option		M68030
-option		M68020		# Must have 68851 PMMU
-option		FPSP
-option		FPU_EMULATE
-option		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#option		MRG_ADB		  # Use ROM-based ADB driver
-
-config		bsd		root on rd0a
-maxusers	16
-
-mainbus0 at root
-
-# on-board I/O
-obio0 at mainbus?
-
-adb0	at obio?
-esp0	at obio?		# SCSI NCR 53C9x
-esp1	at obio?		# SCSI NCR 53C9x
-intvid0	at obio?		# Internal video hardware
-mc*	at obio?		# MACE ethernet on Centris/Quadra 660av
-sn*	at obio?		# Internal ethernet
-zsc0	at obio?		# Zilog serial chip
-zstty*	at zsc?
-
-nubus0		at mainbus?
-
-ae*		at nubus?	# Most Apple Ethernet Cards
-macvid*		at nubus?	# NuBus video cards
-sn*		at nubus?	# SONIC-based ethernet cards
-
-# Attach grf semantics to all video hardware as it is found
-grf*		at intvid?
-grf*		at macvid?
-
-# Attach ite semantics to the appropriate grf device
-ite0		at grf?
-
-# Use only one of ncrscsi or sbc
-#ncrscsi0	at obio?		# SCSI NCR 5380
-sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
-
-scsibus*	at esp?
-#scsibus*	at ncrscsi?
-scsibus*	at sbc?
-
-sd*	at scsibus?		# SCSI disk drives
-st*	at scsibus?		# SCSI tape drives
-cd*	at scsibus?		# SCSI CD-ROM drives
-
-pseudo-device	rd 1