[src/netbsd-6]: src/sys/arch/atari/stand/bootxx Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/b2f56a9b91b7
branches:  netbsd-6
changeset: 776824:b2f56a9b91b7
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 14 14:21:21 2014 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1211):
        sys/arch/atari/stand/bootxx/bootxx.c: revision 1.16
Expand heap to 64KB so that bootxx can load bootxxx from 32KB blocksize ffs.
Tested on TT030 with 32GB SSD via SATA->IDE->SCSI converters.

diffstat:

 sys/arch/atari/stand/bootxx/bootxx.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r b0361dca45d9 -r b2f56a9b91b7 sys/arch/atari/stand/bootxx/bootxx.c
--- a/sys/arch/atari/stand/bootxx/bootxx.c      Sun Dec 14 14:14:48 2014 +0000
+++ b/sys/arch/atari/stand/bootxx/bootxx.c      Sun Dec 14 14:21:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxx.c,v 1.15 2009/08/24 13:04:37 tsutsui Exp $      */
+/*     $NetBSD: bootxx.c,v 1.15.18.1 2014/12/14 14:21:21 martin Exp $  */
 
 /*
  * Copyright (c) 1995 Waldi Ravens.
@@ -49,6 +49,11 @@
 int    load_booter(struct osdsc *);
 int    usr_info(struct osdsc *);
 
+#define        BOOTXXX_MAXSIZE (64 * 1024)
+#define        HEAPSIZE        (64 * 1024)     /* should be >32KB for ffs blocksize */
+#define        HEAPSTART       (LOADADDR3 + BOOTXXX_MAXSIZE)
+#define        HEAPEND         (HEAPSTART + HEAPSIZE)
+
 int
 bootxx(void *readsector, void *disklabel, int autoboot)
 {
@@ -58,10 +63,10 @@
        bxxx_t          bootxxx = (bxxx_t)(LOADADDR3);
 
        memset(edata, 0, end - edata);
-       setheap(end, (void*)(LOADADDR3 - 4));
+       setheap((void *)HEAPSTART, (void *)HEAPEND);
 
        printf("\033v\nNetBSD/atari secondary bootloader"
-                                               " ($Revision: 1.15 $)\n\n");
+                                               " ($Revision: 1.15.18.1 $)\n\n");
 
        if (init_dskio(readsector, disklabel, -1))
                return -1;