[src/netbsd-1-5]: src/sys/arch/news68k/stand Pull up revision 1.2 (requested ...

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

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

description:
Pull up revision 1.2 (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/bootxx/start.S    |  5 +++--
 sys/arch/news68k/stand/common/romcalls.S |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 8c89d57d11a8 -r 948071be58ef sys/arch/news68k/stand/bootxx/start.S
--- a/sys/arch/news68k/stand/bootxx/start.S     Sun Dec 24 07:48:35 2000 +0000
+++ b/sys/arch/news68k/stand/bootxx/start.S     Sun Dec 24 07:48:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: start.S,v 1.1 1999/12/09 14:53:23 tsutsui Exp $        */
+/*     $NetBSD: start.S,v 1.1.6.1 2000/12/24 07:48:46 jhawk Exp $      */
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui. All rights reserved.
@@ -52,5 +52,6 @@
        movl    %d4,%sp@-       | %d4: physmem
 
        jbsr    _C_LABEL(bootxx)
+       lea     %sp@(16),%sp
 
-       jra     _ASM_LABEL(halt)
+       jra     _C_LABEL(rom_halt)
diff -r 8c89d57d11a8 -r 948071be58ef sys/arch/news68k/stand/common/romcalls.S
--- a/sys/arch/news68k/stand/common/romcalls.S  Sun Dec 24 07:48:35 2000 +0000
+++ b/sys/arch/news68k/stand/common/romcalls.S  Sun Dec 24 07:48:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: romcalls.S,v 1.1 1999/12/09 14:53:24 tsutsui Exp $     */
+/*     $NetBSD: romcalls.S,v 1.1.6.1 2000/12/24 07:48:51 jhawk Exp $   */
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui.  All rights reserved.
@@ -32,7 +32,7 @@
        .text
        .align  4
 
-ASENTRY_NOPROFILE(halt)
+ENTRY_NOPROFILE(rom_halt)
        moveq   #8, %d7         | RB_HALT
        trap    #15