summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/mac68k/ramdisk/Makefile21
-rw-r--r--distrib/mac68k/ramdisk/install.md4
-rw-r--r--etc/etc.mac68k/Makefile.inc23
-rw-r--r--sys/arch/mac68k/conf/GENERIC8
-rw-r--r--sys/arch/mac68k/conf/GENERICSBC64
-rw-r--r--sys/arch/mac68k/conf/RAMDISK8
-rw-r--r--sys/arch/mac68k/conf/RAMDISKSBC81
7 files changed, 24 insertions, 185 deletions
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
index 811ba01fcd0..68c3e7f528f 100644
--- a/distrib/mac68k/ramdisk/Makefile
+++ b/distrib/mac68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/04/30 09:18:20 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 2004/12/03 06:37:48 miod Exp $
TOP= ${.CURDIR}/..
@@ -23,16 +23,12 @@ DISKTYPE= rdroot
NBLKS= 2880
NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16 -b 4096
-all: ${BSD_RD} ${BSDSBC_RD}
+all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
-${BSDSBC_RD}: ${CBIN} ${IMAGE} bsdsbc rdsetroot
- cp bsdsbc ${BSDSBC_RD}
- ${.OBJDIR}/rdsetroot ${BSDSBC_RD} < ${IMAGE}
-
${IMAGE}: rd_setup do_files rd_teardown
bsd:
@@ -43,14 +39,6 @@ bsd:
.endif
cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK/bsd bsd
-bsdsbc:
-.ifndef(NOBUILD)
- cd ${.CURDIR}/../../../sys/arch/mac68k/conf && config RAMDISKSBC
- cd ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISKSBC && \
- make clean && make depend && make
-.endif
- cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISKSBC/bsd bsdsbc
-
rd_setup:
dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
vnconfig -v -c ${VND} ${IMAGE}
@@ -75,7 +63,8 @@ unconfig:
install:
cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD}
- cp ${BSDSBC_RD} ${DESTDIR}/snapshot/${BSDSBC_RD}
+ printf "disable ncrscsi\nenable sbc\nquit" | config -e \
+ -o ${DESTDIR}/snapshot/${BSDSBC_RD} ${DESTDIR}/snapshot/${BSD_RD}
${CBIN}.conf: ${LISTS}
awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
@@ -95,7 +84,7 @@ do_files:
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
- *.o *.lo *.c bsd bsdmix bsdofw ${BSD_RD} ${BSDSBC_RD} \
+ *.o *.lo *.c bsd bsdmix bsdofw ${BSD_RD} \
rdsetroot
.include <bsd.obj.mk>
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index cedfb2f3c64..e248baa8d9e 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.22 2004/12/03 06:30:00 miod Exp $
+# $OpenBSD: install.md,v 1.23 2004/12/03 06:37:49 miod Exp $
#
# Copyright (c) 2002, Miodrag Vallat.
# All rights reserved.
@@ -63,7 +63,7 @@
#
# Machine-dependent install sets
-MDSETS="bsd.tgz bsd-sbc.tgz"
+MDSETS="bsdsbc bsdsbc.rd"
MDTERM=vt100
ARCH=ARCH
diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc
index d13073033c8..b4761c01013 100644
--- a/etc/etc.mac68k/Makefile.inc
+++ b/etc/etc.mac68k/Makefile.inc
@@ -1,23 +1,18 @@
-# $OpenBSD: Makefile.inc,v 1.8 2002/10/30 21:37:37 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2004/12/03 06:37:51 miod Exp $
# etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
.ifdef DESTDIR
-snap_md: bsd-generic bsd-genericsbc
- (cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC; \
- tar cf - bsd \
- | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd.tgz)
- (cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERICSBC; \
- tar cf - bsd \
- | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd-sbc.tgz)
-bsd-generic:
+snap_md: bsd distrib
+ cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \
+ ${DESTDIR}/snapshot/bsd
+ printf "disable ncrscsi\nenable sbc\nquit" | config -e \
+ -o ${DESTDIR}/snapshot/bsdsbc ${DESTDIR}/snapshot/bsd
+
+bsd:
cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE}
-bsd-genericsbc:
- cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERICSBC
- cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERICSBC && \
- ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
-.PHONY: bsd-generic bsd-genericsbc
+.PHONY: bsd
.endif # DESTDIR check
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 04:41:17 +0000