Module Name: src
Committed By: martin
Date: Thu Oct 3 17:26:00 UTC 2019
Modified Files:
src/sys/arch/i386/stand/pxeboot [netbsd-9]: Makefile start_pxe.S
Log Message:
Pull up following revision(s) (requested by manu in ticket #277):
sys/arch/i386/stand/pxeboot/start_pxe.S: revision 1.7
sys/arch/i386/stand/pxeboot/Makefile: revision 1.28
Incrase pxeboot code size limit from 64k to 128k. Fixes PR kern/54560.
The start_pxe.S part was suggested by mlelstv.
To generate a diff of this commit:
cvs rdiff -u -r1.25.6.1 -r1.25.6.2 src/sys/arch/i386/stand/pxeboot/Makefile
cvs rdiff -u -r1.6 -r1.6.60.1 src/sys/arch/i386/stand/pxeboot/start_pxe.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.25.6.1 src/sys/arch/i386/stand/pxeboot/Makefile:1.25.6.2
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.25.6.1 Tue Sep 17 19:32:00 2019
+++ src/sys/arch/i386/stand/pxeboot/Makefile Thu Oct 3 17:26:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25.6.1 2019/09/17 19:32:00 martin Exp $
+# $NetBSD: Makefile,v 1.25.6.2 2019/10/03 17:26:00 martin Exp $
S= ${.CURDIR}/../../../..
@@ -66,7 +66,7 @@ CPPFLAGS+= -DBOOTPARAM_DEFFLAGS=0x0c
#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
-SAMISCCPPFLAGS+= -DHEAP_START=0x10000 -DHEAP_LIMIT=0x30000
+SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x40000
SAMISCMAKEFLAGS+= SA_USE_CREAD=yes # Read compressed kernels
CPPFLAGS+= -DPASS_BIOSGEOM
Index: src/sys/arch/i386/stand/pxeboot/start_pxe.S
diff -u src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.6 src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.6.60.1
--- src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.6 Fri Mar 18 17:46:26 2011
+++ src/sys/arch/i386/stand/pxeboot/start_pxe.S Thu Oct 3 17:26:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: start_pxe.S,v 1.6 2011/03/18 17:46:26 jakllsch Exp $ */
+/* $NetBSD: start_pxe.S,v 1.6.60.1 2019/10/03 17:26:00 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@ _C_LABEL(boot_params):
# set up %ss and %sp
movl $_end, %eax /* top of bss */
shrl $4, %eax /* as a segment */
- addw $0x1001, %ax /* and + 64k */
+ addw $0x2001, %ax /* and + 128k */
movw %ax, %ss /* for stack */
movw $0xfffc, %sp /* %sp at top of it */
