[src/trunk]: src/sys/arch/vax/boot Allow for boot.vax and netbsd.vax when boo...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/064914a3f820
branches:  trunk
changeset: 486512:064914a3f820
user:      matt <matt%NetBSD.org@localhost>
date:      Tue May 23 23:34:20 2000 +0000

description:
Allow for boot.vax and netbsd.vax when booting.  this allows a multi
architecture CD to be made which includes VAX support.

diffstat:

 sys/arch/vax/boot/boot/boot.c     |  3 ++-
 sys/arch/vax/boot/xxboot/bootxx.c |  9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 51ab2d82d874 -r 064914a3f820 sys/arch/vax/boot/boot/boot.c
--- a/sys/arch/vax/boot/boot/boot.c     Tue May 23 21:36:43 2000 +0000
+++ b/sys/arch/vax/boot/boot/boot.c     Tue May 23 23:34:20 2000 +0000
@@ -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 @@
 };
 
 char *filer[] = {
+       "netbsd.vax",
        "netbsd",
        "netbsd.gz",
        "netbsd.old",
diff -r 51ab2d82d874 -r 064914a3f820 sys/arch/vax/boot/xxboot/bootxx.c
--- a/sys/arch/vax/boot/xxboot/bootxx.c Tue May 23 21:36:43 2000 +0000
+++ b/sys/arch/vax/boot/xxboot/bootxx.c Tue May 23 23:34:20 2000 +0000
@@ -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 @@
 Xmain()
 {
        int io;
-       char *hej = "/boot";
 
        vax_cputype = (mfpr(PR_SID) >> 24) & 0xFF;
 
@@ -120,7 +119,11 @@
        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);