This fixed a number of things. A serious bug in bugcrt.c's initial stack

among other things.

3 files changed, 17 insertions, 12 deletions

diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index b38a3fb63d2..ee920ad3152 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,10 +1,13 @@
-#	$OpenBSD: Makefile,v 1.4 1998/08/22 09:25:10 smurph Exp $
 
-RELOC=0x3F0000
+#	$OpenBSD: Makefile,v 1.5 1998/12/15 06:32:35 smurph Exp $
+
+RELOC=0xAF0000
 SIZE?=	size
+STRIP?= strip
 
 S=	${.CURDIR}/../../../..
-DEFS= -DSUN_BOOTPARAMS #-DNETIF_DEBUG
+DEFS= -DSUN_BOOTPARAMS 
+#-DNETIF_DEBUG
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${S} -I${S}/lib/libsa
 CFLAGS=	-O2 ${DEFS} ${INCPATH} ${COPTS}
@@ -18,19 +21,21 @@ CLEANFILES+=netboot netboot.bin
 SRCS=   boot.c conf.c version.c devopen.c dev_net.c
 SRCS+=	if_ie.c if_le.c
 OBJS=  ${SRCS:S/.c/.o/g}
-LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
-LDFLAGS+= -nostdlib -s -N -T ${RELOC}
+LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} -lgcc -lc -lgcc
+LDFLAGS+= -s -N -T ${RELOC} 
+#LDFLAGS+= -nostdlib -s -N -Ttext ${RELOC}
 
 all:	netboot.bin
 
 netboot: ${OBJS} ${BUGCRT} ${LIBS}
-	${LD} ${LDFLAGS} -o $@ \
-		${BUGCRT} ${OBJS} ${LIBS}
-	@${SIZE} $@
+	${LD} ${LDFLAGS} \
+		${BUGCRT} ${OBJS} ${LIBS} -o $@
+#	@${SIZE} $@
 
 netboot.bin: netboot
 	${STRIP} netboot
 	dd ibs=32 skip=1 if=netboot of=$@
+#	dd ibs=38 skip=1 if=netboot of=$@
 	chown ${LIBOWN}.${LIBGRP} netboot.bin
 	chmod ${LIBMODE} netboot.bin
 
diff --git a/sys/arch/mvme88k/stand/netboot/boot.c b/sys/arch/mvme88k/stand/netboot/boot.c
index bb07754d4ab..6e132bf34d7 100644
--- a/sys/arch/mvme88k/stand/netboot/boot.c
+++ b/sys/arch/mvme88k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.2 1998/08/22 08:37:53 smurph Exp $ */
+/*	$OpenBSD: boot.c,v 1.3 1998/12/15 06:32:35 smurph Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -90,7 +90,7 @@ main()
 	bugargs.arg_end   = bugargs.nbarg_end;
 	*bugargs.arg_end = 0; /* ensure */
 
-	printf("\n>> OpenBSD MVME187 netboot [%s]\n", version);
+	printf("\n>> OpenBSD MVME%x netboot [%s]\n", bugargs.cputyp, version);
 
 	ret = parse_args(&file, &howto);
 
diff --git a/sys/arch/mvme88k/stand/netboot/if_ie.c b/sys/arch/mvme88k/stand/netboot/if_ie.c
index c856f8a5f81..d9003693331 100644
--- a/sys/arch/mvme88k/stand/netboot/if_ie.c
+++ b/sys/arch/mvme88k/stand/netboot/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.2 1998/08/22 08:38:00 smurph Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.3 1998/12/15 06:32:35 smurph Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -441,7 +441,7 @@ ie_init(desc, machdep_hint)
 	bzero(&ie_softc, sizeof(ie_softc));
 	ie_softc.sc_reg =
 	    (struct iereg *) ie_config[desc->io_netif->nif_unit].phys_addr;
-	ie_softc.sc_mem = (struct iemem *) 0x1e0000;
+	ie_softc.sc_mem = (struct iemem *) 0xae0000;
 	ie_reset(desc->io_netif, desc->myea);
 	printf("device: %s%d attached to %s\n", nif->nif_driver->netif_bname,
 	    nif->nif_unit, ether_sprintf(desc->myea));