Module Name: src
Committed By: phx
Date: Sat Sep 20 23:10:46 UTC 2014
Modified Files:
src/sys/arch/ofppc/stand/ofwboot: Locore.c ofwstart.S version
Log Message:
A stack size of 8K is too small for a block buffer of 65536 bytes.
Increased the stack size to 128K. This makes ofwboot work with FirmWorks
OpenFirmware systems again (tested with Motorola PowerStack II).
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/ofppc/stand/ofwboot/Locore.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ofppc/stand/ofwboot/ofwstart.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ofppc/stand/ofwboot/version
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/ofppc/stand/ofwboot/Locore.c
diff -u src/sys/arch/ofppc/stand/ofwboot/Locore.c:1.22 src/sys/arch/ofppc/stand/ofwboot/Locore.c:1.23
--- src/sys/arch/ofppc/stand/ofwboot/Locore.c:1.22 Mon Jan 12 07:49:57 2009
+++ src/sys/arch/ofppc/stand/ofwboot/Locore.c Sat Sep 20 23:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.22 2009/01/12 07:49:57 tsutsui Exp $ */
+/* $NetBSD: Locore.c,v 1.23 2014/09/20 23:10:46 phx Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,7 @@ static void setup(void);
/* this pad gets the rodata laignment right, don't EVER fiddle it */
char *pad __attribute__((__aligned__ (8))) = "pad";
-int stack[8192/4 + 4] __attribute__((__aligned__ (4), __used__));
+int stack[0x20000/4 + 4] __attribute__((__aligned__ (4), __used__));
char *heapspace __attribute__((__aligned__ (4)));
char altheap[0x20000] __attribute__((__aligned__ (4)));
Index: src/sys/arch/ofppc/stand/ofwboot/ofwstart.S
diff -u src/sys/arch/ofppc/stand/ofwboot/ofwstart.S:1.3 src/sys/arch/ofppc/stand/ofwboot/ofwstart.S:1.4
--- src/sys/arch/ofppc/stand/ofwboot/ofwstart.S:1.3 Mon Apr 28 20:23:31 2008
+++ src/sys/arch/ofppc/stand/ofwboot/ofwstart.S Sat Sep 20 23:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwstart.S,v 1.3 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: ofwstart.S,v 1.4 2014/09/20 23:10:46 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -95,9 +95,8 @@ _entry:
_start:
sync
isync
- lis %r1,stack@ha
- addi %r1,%r1,stack@l
- addi %r1,%r1,8192
+ lis %r1,stack+0x20000@ha
+ addi %r1,%r1,stack+0x20000@l
mfmsr %r8
li %r0,0
Index: src/sys/arch/ofppc/stand/ofwboot/version
diff -u src/sys/arch/ofppc/stand/ofwboot/version:1.12 src/sys/arch/ofppc/stand/ofwboot/version:1.13
--- src/sys/arch/ofppc/stand/ofwboot/version:1.12 Thu Aug 18 09:03:28 2011
+++ src/sys/arch/ofppc/stand/ofwboot/version Sat Sep 20 23:10:46 2014
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.12 2011/08/18 09:03:28 phx Exp $
+$NetBSD: version,v 1.13 2014/09/20 23:10:46 phx Exp $
1.1: Boot program for OpenFirmware; initial revision
1.2: Boot program rearrangement
@@ -12,3 +12,4 @@ $NetBSD: version,v 1.12 2011/08/18 09:03
1.10: Change note to indicate real mode, add ldscript to support 7046
1.11: Support for RDB partitions.
1.12: Fixed MBR support, which had been broken in 1.11.
+1.13: Fixed stack size. Make it work with FirmWorks again.
