[src/trunk]: src/sys/arch/i386/stand This change courtesy of Charles Hannum <...

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

details:   https://anonhg.NetBSD.org/src/rev/93340cc9875a
branches:  trunk
changeset: 486413:93340cc9875a
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun May 21 16:29:14 2000 +0000

description:
This change courtesy of Charles Hannum <root%ihack.net@localhost>.  This
addresses the problems seen by Jason Thorpe <thorpej%netbsd.org@localhost> and
Erik Berls <cyber%netbsd.org@localhost> necessitating rev 1.20 of
biosboot/main.c.

Move BOOTSEG from 0x100 to 0x1000.
Move heap from 0x10000 to 0x20000.

XXXXXXXX

This is a Kluge From Hell to allow boot blocks to grow a little larger
without diskbuf[] crossing a 64k boundary.

diffstat:

 sys/arch/i386/stand/biosboot/Makefile                 |  4 ++--
 sys/arch/i386/stand/lib/crt/bootsect/start_bootsect.S |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r b8b8260a096e -r 93340cc9875a sys/arch/i386/stand/biosboot/Makefile
--- a/sys/arch/i386/stand/biosboot/Makefile     Sun May 21 15:43:56 2000 +0000
+++ b/sys/arch/i386/stand/biosboot/Makefile     Sun May 21 16:29:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2000/05/13 19:58:02 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.30 2000/05/21 16:29:14 jhawk Exp $
 
 S=     ${.CURDIR}/../../../../
 
@@ -57,7 +57,7 @@
 #CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
 
-SAMISCCPPFLAGS+= -DHEAP_START=0x10000 -DHEAP_LIMIT=0x40000
+SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x40000
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_INCLUDE_NET=no
 
 .if (${BASE} == "biosboot")
diff -r b8b8260a096e -r 93340cc9875a sys/arch/i386/stand/lib/crt/bootsect/start_bootsect.S
--- a/sys/arch/i386/stand/lib/crt/bootsect/start_bootsect.S     Sun May 21 15:43:56 2000 +0000
+++ b/sys/arch/i386/stand/lib/crt/bootsect/start_bootsect.S     Sun May 21 16:29:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: start_bootsect.S,v 1.17 2000/05/07 22:58:58 fvdl Exp $ */
+/*     $NetBSD: start_bootsect.S,v 1.18 2000/05/21 16:29:15 jhawk Exp $        */
        
 /*
  * BIOS bootsector startup
@@ -64,7 +64,7 @@
 
 #include "bbinfo.h"
 
-BOOTSEG                =       0x0100  # boot will be loaded here (below 640K)
+BOOTSEG                =       0x01000 # boot will be loaded here (below 640K)
 BOOTSTACK      =       0xfffc  # boot stack
 LOADSZ         =       PRIM_LOADSZ     # size of first loaded chunk
 
@@ -306,7 +306,7 @@
        data32
        pushl   %eax            /* so we get address 0 in BOOTSEG */
        data32
-       pushl   $0x10+LOADSZ*0x10000
+       pushl   $0x10+LOADSZ*0x20000
        movl    %esp, %esi
        movb    $0x42, %ah
        int     $0x13