More installboot related stuff.

3 files changed, 8 insertions, 7 deletions

diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index a29b441ebf8..33497d15719 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.10 1998/08/18 22:58:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 1999/09/26 18:09:03 smurph Exp $
 
-RELOC=0x3F0000 
+RELOC=0xCF0000 
 
 S=	${.CURDIR}/../../../..
 DEFS= 
@@ -18,7 +18,8 @@ CLEANFILES+=bootsd
 
 SRCS=   boot.c conf.c version.c
 
-LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} libgcc.a
+LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} 
+#libgcc.a
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile
index b1e3174b560..870d012a003 100644
--- a/sys/arch/mvme68k/stand/bootxx/Makefile
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.3 1997/10/20 00:33:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1999/09/26 18:09:04 smurph Exp $
 
-RELOC=0x3F0000 
+RELOC=0xAF0000 
 
 S=	${.CURDIR}/../../../..
 DEFS= 
diff --git a/sys/arch/mvme68k/stand/bootxx/bootxx.c b/sys/arch/mvme68k/stand/bootxx/bootxx.c
index a3609b8a356..22490a0aa69 100644
--- a/sys/arch/mvme68k/stand/bootxx/bootxx.c
+++ b/sys/arch/mvme68k/stand/bootxx/bootxx.c
@@ -51,7 +51,7 @@
 /*
  * Boot device is derived from ROM provided information.
  */
-#define LOADADDR	0x11000 /* where to load level 2 bootstrap */
+#define LOADADDR	0xCF0000 /* where to load level 2 bootstrap */
 				/* (l2 must relocate itself) */
 
 /* This determines the largest boot program we can load. */
@@ -90,7 +90,7 @@ main()
 	error = copyboot(&f, addr);
 	f.f_dev->dv_close(&f);
 	if (!error) {
-		bugexec((void (*)())addr);
+		bugexec((void (*)())addr + 8);
 	}
 	/* copyboot had a problem... */
 	_rtt();