From 10dee766076c05a458fafe67067886c5336a9f61 Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Wed, 26 Mar 1997 08:32:48 +0000
Subject: Merge changes from NetBSD, up to 3/19/97; undoes some local changes.
 Changed to match new arch/m68k code. genassym.cf is currently just a place
 holder.

---
 sys/arch/hp300/conf/Makefile.hp300 | 4 ++--
 sys/arch/hp300/conf/files.hp300    | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'sys/arch/hp300/conf')

diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index c85387065b7..631c7ae9f8b 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.12 1997/02/03 04:47:06 downsj Exp $
+#	$OpenBSD: Makefile.hp300,v 1.13 1997/03/26 08:32:38 downsj Exp $
 #	$NetBSD: Makefile.hp300,v 1.45 1996/12/01 06:12:30 jonathan Exp $
 
 # Makefile for OpenBSD
@@ -34,7 +34,7 @@ HP300=	../..
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
-		-Dmc68020 -Dhp300 -DFPCOPROC
+		-Dmc68020 -Dhp300
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index 6a3851f8b42..391bb1dab8f 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.hp300,v 1.7 1997/02/24 01:16:07 downsj Exp $
-#	$NetBSD: files.hp300,v 1.22 1997/01/30 22:11:19 scottr Exp $
+#	$OpenBSD: files.hp300,v 1.8 1997/03/26 08:32:38 downsj Exp $
+#	$NetBSD: files.hp300,v 1.23 1997/03/17 19:46:43 gwr Exp $
 #
 # hp300-specific configuration info
 
@@ -180,8 +180,6 @@ file	arch/hp300/hp300/vm_machdep.c
 file	arch/hp300/hp300/disksubr.c
 file	arch/hp300/dev/dma.c
 
-file	arch/m68k/m68k/copy.s
-
 file	dev/cons.c
 file	dev/cninit.c
 
-- 
cgit v1.2.3