[src/trunk]: src/sys/arch/i386/stand/boot Move the bottom of the heap off the...

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

details:   https://anonhg.NetBSD.org/src/rev/0288e0cf02ec
branches:  trunk
changeset: 759909:0288e0cf02ec
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Dec 20 00:55:10 2010 +0000

description:
Move the bottom of the heap off the top of the stack. Also, increase the heap
size by 64KiB.  These changes allows gzipped Xen with gzipped Dom0 kernels
to successfully boot.  I also suspect this will cure the amd64 CD boot issue
without disabling ext2fs support.

diffstat:

 sys/arch/i386/stand/boot/Makefile.boot |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r f518d03b9c6e -r 0288e0cf02ec sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Mon Dec 20 00:49:23 2010 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Mon Dec 20 00:55:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.46 2010/12/11 08:20:17 mrg Exp $
+# $NetBSD: Makefile.boot,v 1.47 2010/12/20 00:55:10 jakllsch Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -72,10 +72,7 @@
 CPPFLAGS+= -DSUPPORT_CD9660
 CPPFLAGS+= -DSUPPORT_USTARFS
 CPPFLAGS+= -DSUPPORT_DOSFS
-# XXX this bloats(?) /boot and it can't boot from cd anymore
-.if ${MACHINE_ARCH} != "x86_64"
 CPPFLAGS+= -DSUPPORT_EXT2FS
-.endif
 CPPFLAGS+= -DPASS_BIOSGEOM
 CPPFLAGS+= -DPASS_MEMMAP
 #CPPFLAGS+= -DBOOTPASSWD
@@ -84,7 +81,7 @@
 # The biosboot code is linked to 'virtual' address of zero and is
 # loaded at physical address 0x10000.
 # XXX The heap values should be determined from _end.
-SAMISCCPPFLAGS+= -DHEAP_START=0x30000 -DHEAP_LIMIT=0x50000
+SAMISCCPPFLAGS+= -DHEAP_START=0x40000 -DHEAP_LIMIT=0x70000
 SAMISCMAKEFLAGS+= SA_USE_CREAD=yes     # Read compressed kernels
 SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no    # Netboot via TFTP, NFS