[src/netbsd-1-5]: src/sys/arch/news68k/stand/boot Pull up revision 1.3 (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/8c89d57d11a8
branches:  netbsd-1-5
changeset: 490420:8c89d57d11a8
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Dec 24 07:48:35 2000 +0000

description:
Pull up revision 1.3 (requested by tsutsui):
  Make sure to return PROM prompt even if loading kernel fails halfway,
  by calling the PROM halt routine upon failure of loadfile().

diffstat:

 sys/arch/news68k/stand/boot/boot.c   |  10 ++++++++--
 sys/arch/news68k/stand/boot/locore.S |  10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 445dc1a03b27 -r 8c89d57d11a8 sys/arch/news68k/stand/boot/boot.c
--- a/sys/arch/news68k/stand/boot/boot.c        Sun Dec 24 07:48:27 2000 +0000
+++ b/sys/arch/news68k/stand/boot/boot.c        Sun Dec 24 07:48:35 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.2 2000/02/08 16:17:34 tsutsui Exp $ */
+/*     $NetBSD: boot.c,v 1.2.4.1 2000/12/24 07:48:35 jhawk Exp $       */
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui.  All rights reserved.
@@ -102,8 +102,14 @@
                if (fd != -1)
                        break;
        }
-       if (fd == -1)
+       if (fd == -1) {
+#if 0 /* bootxx() may be overrided by loaded kernel */
                return;
+#else
+               rom_halt();
+               /* NOTREACHED */
+#endif
+       }
 
        DPRINTF("entry = 0x%x\n", (int)marks[MARK_ENTRY]);
        DPRINTF("ssym = 0x%x\n", (int)marks[MARK_SYM]);
diff -r 445dc1a03b27 -r 8c89d57d11a8 sys/arch/news68k/stand/boot/locore.S
--- a/sys/arch/news68k/stand/boot/locore.S      Sun Dec 24 07:48:27 2000 +0000
+++ b/sys/arch/news68k/stand/boot/locore.S      Sun Dec 24 07:48:35 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.2 2000/02/08 16:17:34 tsutsui Exp $       */
+/*     $NetBSD: locore.S,v 1.2.4.1 2000/12/24 07:48:40 jhawk Exp $     */
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui.  All rights reserved.
@@ -27,7 +27,8 @@
  */
 
 #include <m68k/asm.h>
-#include <m68k/cpu.h>
+
+       .set    IC_CLEAR,0x9
 
        .text
        .align  4
@@ -42,9 +43,8 @@
        dbra    %d0,1b
 
        jra     _C_LABEL(boot)
-       jra     _ASM_LABEL(halt)
 
 ENTRY_NOPROFILE(ICIA)
-       movl    #0x9, %d0       | IC_CLEAR
-       movc    %d0, %cacr
+       movl    #IC_CLEAR,%d0
+       movc    %d0,%cacr
        rts