Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if booted from sboot, stay in it. 

if booted from the bug, don't enter sboot.
This commit is contained in:
chuck 1996-05-20 00:40:10 +00:00
parent 02f972a4be
commit 914ca91332
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/mvme68k/mvme68k/genassym.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genassym.c,v 1.4 1996/04/26 19:26:41 chuck Exp $ */
/* $NetBSD: genassym.c,v 1.5 1996/05/20 00:40:10 chuck Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -54,6 +54,7 @@
#include <machine/trap.h>
#include <machine/psl.h>
#include <machine/reg.h>
#include <machine/prom.h>
#include <machine/pte.h>
#include <mvme68k/mvme68k/clockreg.h>
@ -99,6 +100,10 @@ main()
def("PGSHIFT", PGSHIFT);
def("USRSTACK", USRSTACK);
/* boot stuff */
def("RB_SBOOT", RB_SBOOT);
def("MVMEPROM_EXIT", MVMEPROM_EXIT);
/* proc fields and values */
off("P_FORW", struct proc, p_forw);
off("P_BACK", struct proc, p_back);

31
sys/arch/mvme68k/mvme68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.8 1996/05/17 04:38:02 chuck Exp $ */
/* $NetBSD: locore.s,v 1.9 1996/05/20 00:40:16 chuck Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -1632,18 +1632,31 @@ _doboot:
movl #CACHE_OFF,d0
movc d0,cacr | disable on-chip cache(s)
Lnocache5:
movl _boothowto,d1 | load howto
movl _bootdev,d0 | and devtype
movl sp@(4),d1 | arg
movl _boothowto,d0 | load howto
movl _bootdev,d1 | and devtype
movl sp@(4),d2 | arg
lea tmpstk,sp | physical SP in case of NMI
movl #0,a7@- | value for pmove to TC (turn off MMU)
pmove a7@,tc | disable MMU
movl #0, d0
movc d0,vbr | ROM VBR
cmpl #0, d1 | autoboot?
jeq Lauto | yes
movl #0, d3
movc d3,vbr | ROM VBR
andl #RB_SBOOT, d0 | mask off
tstl d0 |
bne Lsboot | sboot?
/* NOT sboot */
cmpl #0, d2 | autoboot?
beq 1f | yes!
trap #15 | return to bug
.short MVMEPROM_EXIT | exit
1: movl #0xff800004,a0 | restart the BUG
movl a0@, a0 | get PC
jmp a0@ | go!
Lsboot: /* sboot */
cmpl #0, d2 | autoboot?
beq 1f | yes!
jmp 0x4000 | back to sboot
Lauto: jmp 0x400a | tell sboot to reboot us
1: jmp 0x400a | tell sboot to reboot us
.data
.globl _mmutype,_protorp

5
sys/arch/mvme68k/mvme68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.6 1996/04/26 19:26:55 chuck Exp $ */
/* $NetBSD: machdep.c,v 1.7 1996/05/20 00:40:18 chuck Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -77,6 +77,7 @@
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/prom.h>
#include <machine/psl.h>
#include <machine/pte.h>
#include <dev/cons.h>
@ -1116,7 +1117,7 @@ boot(howto)
if (curproc && curproc->p_addr)
savectx(curproc->p_addr);
boothowto = howto;
boothowto = howto | (boothowto & RB_SBOOT);
if ((howto&RB_NOSYNC) == 0 && waittime < 0) {
waittime = 0;
vfs_shutdown();