diff options
Diffstat (limited to 'sys/arch/sparc/stand')
| -rw-r--r-- | sys/arch/sparc/stand/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/binstall.sh | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/boot.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/bootxx/Makefile | 2 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/installboot.c | 2 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/net.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/promdev.c | 2 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/srt0.S | 9 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/version.c | 2 |
9 files changed, 22 insertions, 17 deletions
diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc index a083047b0d1..5a960d5b0cb 100644 --- a/sys/arch/sparc/stand/Makefile.inc +++ b/sys/arch/sparc/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 1995/10/09 23:25:55 pk Exp $ +# $NetBSD: Makefile.inc,v 1.5 1996/02/01 22:33:01 mycroft Exp $ .if !defined(__stand_makefile_inc) __stand_makefile_inc=1 @@ -22,7 +22,7 @@ DEFS+= -DSTANDALONE -DRELOC=${RELOC} -DSUN4 -DSUN4C -DSUN_BOOTPARAMS CFLAGS+= -O2 ${INCLUDES} ${DEFS} srt0.o: srt0.S - ${CC} ${CFLAGS} -DLOCORE -c ${.IMPSRC} + ${CC} ${CFLAGS} -D_LOCORE -c ${.IMPSRC} cleandir: rm -rf lib machine diff --git a/sys/arch/sparc/stand/binstall.sh b/sys/arch/sparc/stand/binstall.sh index 552a18ef41c..1b2db4158af 100644 --- a/sys/arch/sparc/stand/binstall.sh +++ b/sys/arch/sparc/stand/binstall.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: binstall.sh,v 1.1.2.1 1995/10/13 19:55:03 pk Exp $ +# $NetBSD: binstall.sh,v 1.3 1996/04/07 20:00:12 thorpej Exp $ # vecho () { @@ -59,7 +59,7 @@ fi WHAT=$1 DEST=$2 -if [ "`sysctl -n hw.model | cut -b1-5`" = "SUN/4" ]; then +if [ "`sysctl -n hw.model | cut -b1-5`" = "SUN-4" ]; then KARCH=sun4 else KARCH=sun4c @@ -106,7 +106,7 @@ case $WHAT in ;; "net") - TARGET=$DEST/boot.sparc.openbsd.$KARCH + TARGET=$DEST/boot.sparc.netbsd.$KARCH vecho Target: $TARGET $DOIT dd if=${MDEC}/boot of=$TARGET skip=$SKIP bs=32 ;; diff --git a/sys/arch/sparc/stand/boot.c b/sys/arch/sparc/stand/boot.c index 7a696f208e7..5b423db0ad2 100644 --- a/sys/arch/sparc/stand/boot.c +++ b/sys/arch/sparc/stand/boot.c @@ -39,7 +39,6 @@ #include <sys/reboot.h> #include <a.out.h> #include <stand.h> -#include <paths.h> #include "promdev.h" @@ -51,6 +50,7 @@ int netif_debug; /* * Boot device is derived from ROM provided information. */ +#define DEFAULT_KERNEL "netbsd" extern char *version; unsigned long esym; @@ -69,11 +69,11 @@ main() prom_init(); - printf(">> OpenBSD BOOT [%s]\n", version); + printf(">> NetBSD BOOT [%s]\n", version); file = prom_bootfile; if (file == 0 || *file == 0) - file = _PATH_UNIX; + file = DEFAULT_KERNEL; for (;;) { if (prom_boothow & RB_ASKNAME) { diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile index 7769be5223b..fb0900ac655 100644 --- a/sys/arch/sparc/stand/bootxx/Makefile +++ b/sys/arch/sparc/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.2.1 1995/10/13 19:55:36 pk Exp $ +# $NetBSD: Makefile,v 1.5 1995/10/10 20:07:54 pk Exp $ R= .. .PATH: ${.CURDIR}/${R} diff --git a/sys/arch/sparc/stand/installboot.c b/sys/arch/sparc/stand/installboot.c index e92313f5c69..79dd8964036 100644 --- a/sys/arch/sparc/stand/installboot.c +++ b/sys/arch/sparc/stand/installboot.c @@ -1,4 +1,4 @@ -/* $NetBSD$ */ +/* $NetBSD: installboot.c,v 1.11 1995/11/08 09:09:20 pk Exp $ */ /* * Copyright (c) 1994 Paul Kranenburg diff --git a/sys/arch/sparc/stand/net.c b/sys/arch/sparc/stand/net.c index f70c1834793..e67b22ac6f4 100644 --- a/sys/arch/sparc/stand/net.c +++ b/sys/arch/sparc/stand/net.c @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.2 1995/09/18 21:31:46 pk Exp $ */ +/* $NetBSD: net.c,v 1.3 1996/05/04 19:36:01 pk Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -153,5 +153,7 @@ net_mountroot() printf("root addr=%s path=%s\n", inet_ntoa(rootip), rootpath); /* Get the NFS file handle (mount). */ - return nfs_mount(netdev_sock, rootip, rootpath); + if (nfs_mount(netdev_sock, rootip, rootpath) != 0) + return (errno); + return 0; } diff --git a/sys/arch/sparc/stand/promdev.c b/sys/arch/sparc/stand/promdev.c index 1404ce4f20d..94ab155eff0 100644 --- a/sys/arch/sparc/stand/promdev.c +++ b/sys/arch/sparc/stand/promdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: promdev.c,v 1.14.2.1 1995/10/13 19:53:55 pk Exp $ */ +/* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg diff --git a/sys/arch/sparc/stand/srt0.S b/sys/arch/sparc/stand/srt0.S index b31e322a86d..e5248292b84 100644 --- a/sys/arch/sparc/stand/srt0.S +++ b/sys/arch/sparc/stand/srt0.S @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.5 1995/12/13 23:35:18 pk Exp $ */ +/* $NetBSD: srt0.S,v 1.5.4.2 1996/07/17 01:51:46 jtc Exp $ */ /* * Copyright (c) 1994 Paul Kranenburg @@ -102,13 +102,16 @@ start: call _bzero sub %o1, %o0, %o1 +#if 0 /* - * Enable interrupts. + * Enable interrupts above level 11. This enables "L1-A", but + * avoids spurious interrupt bites from most other devices */ rd %psr, %o0 andn %o0, PSR_PIL, %o0 - wr %g0, %o0, %psr + wr %o0, 0xb00, %psr ! (11 << 8) nop; nop; nop +#endif /* * Set CPU type that we are running on. diff --git a/sys/arch/sparc/stand/version.c b/sys/arch/sparc/stand/version.c index f288f3059da..1217ce7aba7 100644 --- a/sys/arch/sparc/stand/version.c +++ b/sys/arch/sparc/stand/version.c @@ -38,4 +38,4 @@ * 1.4 add oldmon support and network support. */ -char *version = "$Revision: 1.1 $"; +char *version = "$Revision: 1.2 $"; |