kernel name is /bsd

5 files changed, 14 insertions, 20 deletions

diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index a9918483c75..c008ca04ec7 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -44,7 +44,7 @@ options		GATEWAY		# IP packet forwarding
 #options	EON
 #options	COMPAT_09, COMPAT_10
 
-config	netbsd		swap generic
+config		bsd		swap generic
 
 pseudo-device	sl 2
 pseudo-device	ppp 2
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index 1db2af5c30a..8f8dcf00def 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -38,7 +38,7 @@ options		GATEWAY		# IP packet forwarding
 #options	EON
 #options	COMPAT_09, COMPAT_10
 
-config	netbsd	swap generic
+config		bsd	swap generic
 
 #pseudo-device	sl
 #pseudo-device	ppp 2
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 7f245be0c40..393a9cd0d03 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -42,7 +42,7 @@ options		GATEWAY		# IP packet forwarding
 #options	EON
 #options	COMPAT_09, COMPAT_10
 
-config	netbsd	swap generic
+config		bsd	swap generic
 
 #pseudo-device	sl
 #pseudo-device	ppp 2
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index be091c704d0..824b8c0f2e6 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -42,7 +42,7 @@ options		GATEWAY		# IP packet forwarding
 #options	EON
 #options	COMPAT_09, COMPAT_10
 
-config	netbsd	swap generic
+config		bsd	swap generic
 
 #pseudo-device	sl
 #pseudo-device	ppp 2
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index aaa6a67eb23..3ec3882ec3e 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,15 +1,9 @@
-#	$NetBSD: Makefile.mvme68k,v 1.3 1995/09/19 23:50:22 thorpej Exp $
-
-#	@(#)Makefile.hp300	8.2 (Berkeley) 1/23/94
-#
-# Makefile for NetBSD
-#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/mvme68k/conf/``machineid''
 # after which you should do
-#	 config.new machineid
+#	 config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/mvme68k/conf/Makefile.mvme68k
 # after which config should be rerun for all machines of that type.
@@ -24,19 +18,19 @@
 # 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).
 AS=     as ${DEBUG}
-AWK=	awk
 CC=     cc ${DEBUG}
 CPP=    cpp
 LD=     ld
 TOUCH=	touch -f -c
+AWK=	awk
 
 # source tree is located via $S relative to the compilation directory
 S=	../../../..
 MVME68K=	../..
 
 INCLUDES= -I. -I$S/arch -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmvme68k -DFPCOPROC
-CFLAGS=	-O -Werror -fno-builtin ${COPTS}
+COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmvme68k
+CFLAGS=	-O ${COPTS}
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
@@ -49,9 +43,9 @@ LIBKERN=	${KERNLIB_PROF}
 ### find out what to use for libcompat
 .include "$S/compat/common/Makefile.inc"
 .ifndef PROF
-LIBCOMPAT=    ${COMPATLIB}
+LIBCOMPAT=	${COMPATLIB}
 .else
-LIBCOMPAT=    ${COMPATLIB_PROF}
+LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
@@ -91,11 +85,11 @@ LDX=-X
 .else
 LDX=-x
 .endif
-SYSTEM_OBJ=	locore.o ${FPSP} vnode_if.o ${OBJS} param.o ioconf.o \
-	${LIBKERN} ${LIBCOMPAT}
+SYSTEM_OBJ=	locore.o vnode_if.o ${OBJS} param.o ioconf.o ${FPSP} \
+		${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@echo loading $@; rm -f $@
-SYSTEM_LD=	@${LD} ${LDX} -Ttext 0x8000 -n -o $@ -e start \
+SYSTEM_LD=	@${LD} ${LDX} -Ttext 0x10000 -z -o $@ -e start \
 		    ${SYSTEM_OBJ} vers.o
 SYSTEM_LD_TAIL=	@echo rearranging symbols; size $@; chmod 755 $@
 
@@ -108,7 +102,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	${CC} ${CFLAGS} -c vers.c
 
 clean::
-	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.o locore.i \
+	rm -f eddep bsd bsd.gdb tags vnode_if.[ch] *.o locore.i \
 	    [a-z]*.s [Ee]rrs linterrs makelinks genassym
 
 lint: /tmp param.c