[src/netbsd-1-4]: src/sys/arch/next68k/next68k Pull up revision 1.11 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/41f6dc7b838f
branches:  netbsd-1-4
changeset: 470116:41f6dc7b838f
user:      he <he%NetBSD.org@localhost>
date:      Thu Jan 20 23:31:12 2000 +0000

description:
Pull up revision 1.11 (requested by dbj):
  Fix boot failure on machines which do not have 32M of memory.
  Fixes PR#8962.

diffstat:

 sys/arch/next68k/next68k/nextrom.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r c0d34770bedd -r 41f6dc7b838f sys/arch/next68k/next68k/nextrom.c
--- a/sys/arch/next68k/next68k/nextrom.c        Thu Jan 20 23:24:39 2000 +0000
+++ b/sys/arch/next68k/next68k/nextrom.c        Thu Jan 20 23:31:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nextrom.c,v 1.10 1999/03/24 23:15:59 dbj Exp $ */
+/*     $NetBSD: nextrom.c,v 1.10.2.1 2000/01/20 23:31:12 he Exp $      */
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -106,6 +106,7 @@
 u_char *rom_return_sp;
 u_int rom_mon_stack;
 u_char rom_image[0x2000];
+vm_offset_t rom_image_base;
 u_int rom_vbr;;
 
 paddr_t rom_reboot_vect;
@@ -211,6 +212,7 @@
                 * top of memory
                 */
                RELOC(phys_seg_list[j-1].ps_end, vm_offset_t) -= 0x2000;
+               RELOC(rom_image_base, vm_offset_t) = RELOC(phys_seg_list[j-1].ps_end, vm_offset_t);
 
     /* pmap is unhappy if it is not null terminated */
     for(;j<MAX_PHYS_SEGS;j++) {
@@ -288,7 +290,7 @@
                RELOC(rom_reboot_vect, paddr_t) = MONRELOC(paddr_t *, MG_vbr)[45]; /* trap #13 */
 
                for(i=0;i<sizeof(rom_image);i++) {
-                       RELOC(rom_image[i], u_char) = *(u_char *)(0x6000000-0x2000+i);
+                       RELOC(rom_image[i], u_char) = *(u_char *)(RELOC(rom_image_base, vm_offset_t) + i);
                }
        }