RIP mac68k. No one loves you anymore.

4 files changed, 0 insertions, 448 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
deleted file mode 100644
index 624730f3136..00000000000
--- a/sys/arch/mac68k/conf/GENERIC
+++ /dev/null
@@ -1,75 +0,0 @@
-#	$OpenBSD: GENERIC,v 1.51 2011/06/29 20:52:09 matthew Exp $
-#
-# For further information on compiling OpenBSD kernels, see the config(8)
-# man page.
-#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page.  For further information about kernel options
-# for this architecture, see the options(4) man page.  For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-
-machine		mac68k m68k
-include		"../../../conf/GENERIC"
-maxusers	32			# estimated number of users
-
-# Mac-specific options
-option		M68040
-option		M68030
-option		M68020		# Must have 68851 PMMU
-option		FPSP
-option		FPU_EMULATE
-option		ADBVERBOSE
-option	WSDISPLAY_COMPAT_RAWKBD		# provide raw scancodes; needed for X11
-
-config		bsd	swap generic
-
-mainbus0	at root
-
-# on-board I/O
-obio0		at mainbus?
-
-adb0		at obio?
-akbd*		at adb?		# ADB keyboard
-ams*		at adb?		# ADB mouse
-
-asc0		at obio?	# ASC/EASC audio
-esp0		at obio?	# SCSI NCR 53C9x
-esp1		at obio?	# SCSI NCR 53C9x
-macfb*		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?
-
-# nubus boards
-nubus0		at mainbus?
-
-ae*		at nubus?	# Most Apple Ethernet Cards
-macfb*		at nubus?	# NuBus video cards
-sn*		at nubus?	# SONIC-based ethernet cards
-#sm*		at nubus?	# SMC 91cxx-based ethernet cards
-
-#nsphy*		at mii? phy?
-#ukphy*		at mii? phy?
-
-# workstation console
-wsdisplay*	at macfb?
-wskbd*		at akbd? mux 1
-wsmouse*	at ams? mux 0
-
-# Enable only one of ncrscsi or sbc
-ncrscsi0	at obio?		# SCSI NCR 5380
-sbc0		at obio? disable flags 0x1	# MI NCR 5380 SCSI Bus Controller
-
-
-scsibus*	at scsi?
-sd*		at scsibus?	# SCSI disk drives
-st*		at scsibus?	# SCSI tape drives
-cd*		at scsibus?	# SCSI CD-ROM drives
-ch*		at scsibus?	# SCSI autochangers
-safte*		at scsibus?	# SCSI accessed fault-tolerant enclosures
-ses*		at scsibus?	# SCSI enclosure services
-uk*		at scsibus?	# SCSI unknown
-
-pseudo-device	wsmux	2
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
deleted file mode 100644
index 5dafae8771a..00000000000
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ /dev/null
@@ -1,171 +0,0 @@
-#	$OpenBSD: Makefile.mac68k,v 1.74 2011/11/08 18:41:34 matthieu Exp $
-
-# For instructions on building kernels consult the config(8) and options(4)
-# manual pages.
-#
-# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
-#	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
-# DEBUG is set to -g by config if debugging is requested (config -g).
-# PROF is set to -pg by config if profiling is requested (config -p).
-
-.include <bsd.own.mk>
-
-SIZE?=	size
-STRIP?=	strip
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!=	cd ../../../..; pwd
-.endif
-
-_machdir?=	$S/arch/${_mach}
-_archdir?=	$S/arch/${_arch}
-
-INCLUDES=	-nostdinc -I. -I$S -I$S/arch
-CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
-CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-		-Wno-main -Wno-uninitialized -Wno-format \
-		-Wstack-larger-than-2047
-
-CMACHFLAGS=	-msoft-float
-CMACHFLAGS+=	-fno-builtin-printf -fno-builtin-snprintf \
-		-fno-builtin-vsnprintf -fno-builtin-log \
-		-fno-builtin-log2 -fno-builtin-malloc 
-.if ${IDENT:M-DNO_PROPOLICE}
-CMACHFLAGS+=	-fno-stack-protector
-.endif
-
-COPTS?=		-O2
-CFLAGS=		${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
-AFLAGS=		-D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS}
-LINKFLAGS=	-n -Ttext 0 -e start
-
-.if ${IDENT:M-DDDB_STRUCT}
-DB_STRUCTINFO=	db_structinfo.h
-.else
-DB_STRUCTINFO=
-.endif
-
-.include "${_archdir}/fpsp/Makefile.inc"
-
-HOSTCC?=	${CC}
-HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
-HOSTED_CFLAGS=	${CFLAGS}
-HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
-
-NORMAL_C_NOP=	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
-NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-# load lines for config "xxx" will be emitted as:
-# xxx: ${SYSTEM_DEP} swapxxx.o
-#	${SYSTEM_LD_HEAD}
-#	${SYSTEM_LD} swapxxx.o
-#	${SYSTEM_LD_TAIL}
-SYSTEM_HEAD=	locore.o param.o ioconf.o ${FPSP}
-SYSTEM_OBJ=	${SYSTEM_HEAD} ${OBJS}
-SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	@rm -f $@
-SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \
-		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS}
-SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-LINKFLAGS+=	-X
-STRIPFLAGS=	-g
-SYSTEM_LD_TAIL+=; \
-		echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
-		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
-.else
-LINKFLAGS+=	-S
-.endif
-
-%LOAD
-
-# cc's -MD puts the source and output paths in the dependency file;
-# since those are temp files here we need to fix it up.  It also
-# puts the file in /tmp, so we use -MF to put it in the current
-# directory as assym.P and then generate assym.d from it with a
-# good target name
-assym.h: $S/kern/genassym.sh Makefile \
-	 ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf
-	cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
-	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} -MF assym.P > assym.h.tmp
-	sed '1s/.*/assym.h: \\/' assym.P > assym.d
-	sort -u assym.h.tmp > assym.h
-
-param.c: $S/conf/param.c
-	rm -f param.c
-	cp $S/conf/param.c .
-
-param.o: param.c Makefile
-	${NORMAL_C}
-
-mcount.o: $S/lib/libkern/mcount.c Makefile
-	${NORMAL_C_NOP}
-
-ioconf.o: ioconf.c
-	${NORMAL_C}
-
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-clean::
-	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
-
-lint:
-	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${CFILES} ioconf.c param.c | \
-	    grep -v 'static function .* unused'
-
-depend:
-	@touch $@
-
-tags:
-	@echo "see $S/kern/Makefile for tags"
-
-db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
-	${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c
-	objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
-	rm -f db_structinfo.o
-
-locore.o: ${_machdir}/${_mach}/locore.s assym.h
-copy.o copypage.o: assym.h
-
-# The install target can be redefined by putting a
-# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
-MACHINE_NAME!=  uname -n
-install: install-kernel-${MACHINE_NAME}
-.if !target(install-kernel-${MACHINE_NAME}})
-install-kernel-${MACHINE_NAME}:
-	rm -f /obsd
-	ln /bsd /obsd
-	cp bsd /nbsd
-	mv /nbsd /bsd
-.endif
-
-# pull in the dependency information
-.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO})
- ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
-.endif
-.ifnmake clean
-. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
-.  if exists(${o:R}.d)
-.   include "${o:R}.d"
-.  elif exists($o)
-    .PHONY: $o
-.  endif
-. endfor
-.endif
-
-%RULES
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
deleted file mode 100644
index 441dcae0314..00000000000
--- a/sys/arch/mac68k/conf/RAMDISK
+++ /dev/null
@@ -1,75 +0,0 @@
-#	$OpenBSD: RAMDISK,v 1.25 2011/11/08 19:22:13 deraadt Exp $
-
-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		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		M68040
-option		M68030
-option		M68020		# Must have 68851 PMMU
-option		FPSP
-option		FPU_EMULATE
-
-config		bsd		root on rd0a
-maxusers	32
-
-mainbus0	at root
-
-# on-board I/O
-obio0		at mainbus?
-
-adb0		at obio?
-akbd*		at adb?		# ADB keyboard
-#ams*		at adb?		# ADB mouse
-
-esp0		at obio?	# SCSI NCR 53C9x
-esp1		at obio?	# SCSI NCR 53C9x
-macfb*		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?
-
-# nubus boards
-nubus0		at mainbus?
-
-ae*		at nubus?	# Most Apple Ethernet Cards
-macfb*		at nubus?	# NuBus video cards
-sn*		at nubus?	# SONIC-based ethernet cards
-
-# workstation console
-wsdisplay*	at macfb?
-wskbd*		at akbd?
-#wsmouse*	at ams?
-
-# Enable only one of ncrscsi or sbc
-ncrscsi0	at obio?		# SCSI NCR 5380
-sbc0		at obio? disable flags 0x1	# MI NCR 5380 SCSI Bus Controller
-
-
-scsibus*	at scsi?
-sd*		at scsibus?		# SCSI disk drives
-st*		at scsibus?		# SCSI tape drives
-cd*		at scsibus?		# SCSI CD-ROM drives
-
-pseudo-device	rd 1
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
deleted file mode 100644
index 5a42965a28d..00000000000
--- a/sys/arch/mac68k/conf/files.mac68k
+++ /dev/null
@@ -1,127 +0,0 @@
-#	$OpenBSD: files.mac68k,v 1.43 2007/01/22 13:17:45 martin Exp $
-#	$NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
-
-# mac68k-specific configuration info
-
-# maxpartitions must be first item in files.${ARCH}.newconf
-maxpartitions 16 
-
-maxusers 2 8 64
-
-device mainbus {}			# no locators (yet?)
-attach mainbus at root
-
-device	obio {[ addr = -1 ]}
-attach	obio at mainbus
-file	arch/mac68k/dev/obio.c		obio
-
-device	nubus {}
-attach	nubus at mainbus
-file	arch/mac68k/dev/nubus.c		nubus
-
-device	adb {}
-attach	adb at obio
-file	arch/mac68k/dev/adb.c		adb
-file	arch/mac68k/dev/pm_direct.c	adb
-
-#
-# "workstation console" routines
-#
-include "dev/rasops/files.rasops"
-include	"dev/wscons/files.wscons"
-include "dev/wsfont/files.wsfont"
-
-#
-# adb devices
-#
-include	"dev/adb/files.adb"
-file	arch/mac68k/dev/akbd_machdep.c	akbd
-
-device	asc
-attach	asc at obio
-file	arch/mac68k/dev/asc.c		asc needs-flag
-
-device	macfb: wsemuldisplaydev, rasops1, rasops2, rasops4, rasops8, rasops16, rasops32
-attach	macfb at obio with macfb_obio
-attach	macfb at nubus with macfb_nubus
-file	arch/mac68k/dev/macfb.c		macfb needs-flag
-file	arch/mac68k/dev/grf_iv.c	macfb_obio
-file	arch/mac68k/dev/grf_mv.c	macfb_nubus
-
-device	ae: ifnet, ether, dp8390nic, ifmedia
-attach	ae at nubus with ae_nubus
-file	arch/mac68k/dev/if_ae_nubus.c	ae_nubus
-file	arch/mac68k/dev/if_ae.c		ae
-
-device	sn: ifnet, ether
-attach	sn at obio with sn_obio
-attach	sn at nubus with sn_nubus
-file	arch/mac68k/dev/if_sn.c		sn
-file	arch/mac68k/dev/if_sn_obio.c	sn_obio
-file	arch/mac68k/dev/if_sn_nubus.c	sn_nubus
-
-device	mc: ifnet, ether
-attach	mc at obio with mc_obio
-file	arch/mac68k/dev/if_mc.c
-file	arch/mac68k/dev/if_mc_obio.c
-
-attach	sm at nubus with sm_nubus
-file	arch/mac68k/dev/if_sm_nubus.c	sm_nubus
-
-include "scsi/files.scsi"
-include "dev/mii/files.mii"
-
-# Option 1 for ncr5380 support
-device	ncrscsi: scsi
-attach	ncrscsi at obio
-file	arch/mac68k/dev/mac68k5380.c	ncrscsi needs-flag
-
-# Option 2 for ncr5380 support
-device	sbc: scsi, ncr5380sbc
-attach	sbc at obio with sbc_obio
-file	arch/mac68k/dev/sbc_obio.c	sbc_obio
-file	arch/mac68k/dev/sbc.c		sbc
-
-attach	esp at obio
-file	arch/mac68k/dev/esp.c		esp
-
-device	zsc {[channel = -1]}
-attach	zsc at obio
-file	arch/mac68k/dev/zs.c		zsc needs-flag
-file	arch/mac68k/dev/z8530sc.c	zsc
-
-device	zstty: tty
-attach	zstty at zsc
-file	arch/mac68k/dev/z8530tty.c	zstty needs-flag
-
-file	arch/m68k/m68k/db_memrw.c	ddb
-include "arch/m68k/fpe/files.fpe"
-
-file	arch/mac68k/mac68k/autoconf.c
-file	arch/mac68k/mac68k/bus_space.c
-file	arch/mac68k/mac68k/clock.c
-file	arch/mac68k/mac68k/conf.c
-file	arch/mac68k/mac68k/disksubr.c		disk
-file	arch/mac68k/mac68k/intr.c
-file	arch/mac68k/mac68k/iop.c
-file	arch/mac68k/mac68k/machdep.c
-file	arch/mac68k/mac68k/mainbus.c
-file	arch/mac68k/mac68k/mem.c
-file	arch/m68k/m68k/pmap_motorola.c
-file	arch/mac68k/mac68k/pmap_bootstrap.c
-file	arch/mac68k/mac68k/pram.c
-file	arch/mac68k/mac68k/pramasm.s
-file	arch/mac68k/mac68k/psc.c
-file	arch/mac68k/mac68k/sys_machdep.c
-file	arch/mac68k/mac68k/trap.c
-file	arch/mac68k/mac68k/via.c
-file	arch/mac68k/mac68k/vm_machdep.c
-file	arch/mac68k/mac68k/wscons_machdep.c
-
-file	dev/cninit.c
-
-major	{sd = 4}
-major	{st = 5}
-major	{cd = 6}
-major	{vnd = 8}
-major	{rd = 13}