Allow for boot.vax and netbsd.vax when booting. this allows a multi

architecture CD to be made which includes VAX support.
This commit is contained in:
matt 2000-05-23 23:34:20 +00:00
parent 27a876b17c
commit 62469cb55a
2 changed files with 8 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.6 2000/05/20 13:35:07 ragge Exp $ */
/* $NetBSD: boot.c,v 1.7 2000/05/23 23:34:20 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@ -75,6 +75,7 @@ struct vals {
};
char *filer[] = {
"netbsd.vax",
"netbsd",
"netbsd.gz",
"netbsd.old",

View File

@ -1,4 +1,4 @@
/* $NetBSD: bootxx.c,v 1.7 2000/05/21 09:44:16 ragge Exp $ */
/* $NetBSD: bootxx.c,v 1.8 2000/05/23 23:34:21 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@ -90,7 +90,6 @@ void
Xmain()
{
int io;
char *hej = "/boot";
vax_cputype = (mfpr(PR_SID) >> 24) & 0xFF;
@ -120,7 +119,11 @@ Xmain()
rpb->rpb_base = rpb;
rpb->iovec = (int)bqo;
io = open(hej, 0);
io = open("/boot.vax", 0);
if (io < 0)
io = open("/boot", 0);
if (io < 0)
asm("halt");
read(io, (void *)0x10000, 0x10000);
bcopy((void *) 0x10000, 0, 0xffff);