Continue factorizing m88k common code, this time files in <arch>/<arch>

which were copied verbatim from mvme88k to luna88k.

This requires backing out syntactic sugar in mvme88k kernel configuration
files which would deduct the required processor types from the board models,
as the common code only depends upon the M88100 and M88110 defines.

4 files changed, 13 insertions, 17 deletions

diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC
index 6be78a4d132..d0baea0be60 100644
--- a/sys/arch/luna88k/conf/GENERIC
+++ b/sys/arch/luna88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.2 2004/04/26 12:34:02 miod Exp $
+#	$OpenBSD: GENERIC,v 1.3 2004/04/29 14:33:24 miod Exp $
 
 machine		luna88k m88k
 
@@ -8,6 +8,9 @@ option		"NCPUS=1"	# number of CPUs supported (max 4)
 #option		DEBUG		# print debugging statements
 #option		EH_DEBUG	# debugging code for exception handlers
 
+# Processor type
+option		M88100		# 88100 support; mandatory
+
 # Define this if your processor has the xxx.usr bug (mask C82N)
 option		ERRATA__XXX_USR	
 
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 9c67c8fca69..992cc4979e7 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.1 2004/04/21 15:23:47 aoyama Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.2 2004/04/29 14:33:24 miod Exp $
 #
 # Makefile for OpenBSD
 #
@@ -32,6 +32,7 @@ STRIP?= strip
 S!=	cd ../../../..; pwd
 .endif
 LUNA88K=	$S/arch/luna88k
+M88K=		$S/arch/m88k
 
 INCLUDES=	-nostdinc -I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dluna88k -Dm88k
@@ -52,10 +53,6 @@ HOSTCC?=	${CC}
 HOSTED_CPPFLAGS?=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS?=	${CFLAGS}
 
-### CPU configuration
-
-CPPFLAGS+=	-DM88100
-
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
@@ -119,9 +116,9 @@ LINKFLAGS+=	-x
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${LUNA88K}/luna88k/genassym.cf Makefile
+assym.h: $S/kern/genassym.sh ${M88K}/m88k/genassym.cf Makefile
 	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${LUNA88K}/luna88k/genassym.cf > assym.h.tmp && \
+	    ${PARAM} < ${M88K}/m88k/genassym.cf > assym.h.tmp && \
 	    mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK
index d579558fd61..e066edb7d52 100644
--- a/sys/arch/luna88k/conf/RAMDISK
+++ b/sys/arch/luna88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.2 2004/04/26 12:34:02 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.3 2004/04/29 14:33:24 miod Exp $
 
 machine		luna88k m88k
 
@@ -8,6 +8,9 @@ option		RAMDISK_HOOKS
 
 option		"NCPUS=1"	# number of CPUs supported (max 4)
 
+# Processor type
+option		M88100		# 88100 support; mandatory
+
 # Define this if your processor has the xxx.usr bug (mask C82N)
 option		ERRATA__XXX_USR	
 
diff --git a/sys/arch/luna88k/conf/files.luna88k b/sys/arch/luna88k/conf/files.luna88k
index b60d9268090..3b2c8d3547b 100644
--- a/sys/arch/luna88k/conf/files.luna88k
+++ b/sys/arch/luna88k/conf/files.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.luna88k,v 1.1 2004/04/21 15:23:47 aoyama Exp $
+#	$OpenBSD: files.luna88k,v 1.2 2004/04/29 14:33:24 miod Exp $
 #	
 maxpartitions 16
 
@@ -76,23 +76,16 @@ file	arch/luna88k/luna88k/clock.c
 
 file	arch/luna88k/luna88k/autoconf.c
 file	arch/luna88k/luna88k/conf.c
-file	arch/luna88k/luna88k/cmmu.c
 file	arch/luna88k/luna88k/m8820x.c
 file	arch/luna88k/luna88k/disksubr.c
 #file	arch/luna88k/luna88k/dkbad.c
 file	arch/luna88k/luna88k/eh.S
 file	arch/luna88k/luna88k/isr.c
-file	arch/luna88k/luna88k/locore_asm_routines.S
 file	arch/luna88k/luna88k/locore_c_routines.c
-file	arch/luna88k/luna88k/m88100_fp.S
 file	arch/luna88k/luna88k/machdep.c
 file	arch/luna88k/luna88k/mem.c
 file	arch/luna88k/luna88k/pmap.c
 file	arch/luna88k/luna88k/pmap_table.c
-file	arch/luna88k/luna88k/process.S
-file	arch/luna88k/luna88k/process_machdep.c
-file	arch/luna88k/luna88k/trap.c
-file	arch/luna88k/luna88k/vectors_88100.S
 file	arch/luna88k/luna88k/vm_machdep.c
 file	arch/luna88k/ddb/db_disasm.c			ddb
 file	arch/luna88k/ddb/db_interface.c			ddb