Index: boot/arch/sparc64/loader/asm.S
===================================================================
--- boot/arch/sparc64/loader/asm.S	(revision 94d614ef2057652d47a2a1df5f4c4809bbe31b2f)
+++ boot/arch/sparc64/loader/asm.S	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -27,7 +27,6 @@
 #
 
-#define STACK_WINDOW_SAVE_AREA_SIZE     (16*8)
-
-#define PSTATE_AM_BIT	8
+#include <stack.h>
+#include <register.h>
 
 .text
Index: boot/arch/sparc64/loader/boot.S
===================================================================
--- boot/arch/sparc64/loader/boot.S	(revision 94d614ef2057652d47a2a1df5f4c4809bbe31b2f)
+++ boot/arch/sparc64/loader/boot.S	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -27,8 +27,8 @@
 #
 
-#define INITIAL_STACK 0x0
+#include <stack.h>
+#include <register.h>
 
-#define PSTATE_IE_BIT	2
-#define PSTATE_AM_BIT	8
+#define INITIAL_STACK_SIZE 	1024
 
 .register %g2, #scratch
@@ -63,5 +63,6 @@
 	wrpr %g2, 0, %pstate
 
-	# TODO: set initial stack
+	set initial_stack_top, %g3
+	add %g3, -STACK_BIAS, %sp
 
 	set ofw_cif, %l0
@@ -72,2 +73,8 @@
 	b bootstrap
 	nop
+
+.align 16
+initial_stack:
+	.space INITIAL_STACK_SIZE
+initial_stack_top:
+	.space STACK_WINDOW_SAVE_AREA_SIZE
Index: boot/arch/sparc64/loader/register.h
===================================================================
--- boot/arch/sparc64/loader/register.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
+++ boot/arch/sparc64/loader/register.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BOOT_sparc64_REGISTER_H_
+#define BOOT_sparc64_REGISTER_H_
+
+#define PSTATE_IE_BIT   2
+#define PSTATE_AM_BIT   8
+
+#endif
Index: boot/arch/sparc64/loader/stack.h
===================================================================
--- boot/arch/sparc64/loader/stack.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
+++ boot/arch/sparc64/loader/stack.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BOOT_sparc64_STACK_H_
+#define BOOT_sparc64_STACK_H_
+
+#define STACK_ALIGNMENT			16
+#define STACK_BIAS			2047
+#define STACK_WINDOW_SAVE_AREA_SIZE	(16*8)
+
+#endif