Index: kernel/arch/sparc64/include/arch.h
===================================================================
--- kernel/arch/sparc64/include/arch.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
+++ kernel/arch/sparc64/include/arch.h	(revision c5cb943d5d19ad0d75578f54188f2491dfd64937)
@@ -27,14 +27,16 @@
  */
 
-/** @addtogroup sparc64	
+/** @addtogroup sparc64
  * @{
  */
 /**
  * @file
- * @brief	Various sparc64-specific macros.
+ * @brief Various sparc64-specific macros.
  */
 
 #ifndef KERN_sparc64_ARCH_H_
 #define KERN_sparc64_ARCH_H_
+
+#include <arch/boot/boot.h>
 
 #if defined (SUN4U)
@@ -44,15 +46,14 @@
 #endif
 
-#define ASI_AIUP		0x10	/** Access to primary context with user privileges. */
-#define ASI_AIUS		0x11	/** Access to secondary context with user privileges. */
+#define ASI_AIUP  0x10  /** Access to primary context with user privileges. */
+#define ASI_AIUS  0x11  /** Access to secondary context with user privileges. */
 
-#define NWINDOWS		8	/** Number of register window sets. */
+#define NWINDOWS  8  /** Number of register window sets. */
 
 #ifndef __ASM__
 
-extern void arch_pre_main(void);
+extern void arch_pre_main(bootinfo_t *);
 
 #endif /* __ASM__ */
-
 
 #endif
Index: kernel/arch/sparc64/include/boot/boot.h
===================================================================
--- kernel/arch/sparc64/include/boot/boot.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
+++ kernel/arch/sparc64/include/boot/boot.h	(revision c5cb943d5d19ad0d75578f54188f2491dfd64937)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64	
+/** @addtogroup sparc64
  * @{
  */
@@ -36,6 +36,6 @@
 #define KERN_sparc64_BOOT_H_
 
-#define VMA			0x400000
-#define LMA			VMA
+#define VMA  0x400000
+#define LMA  VMA
 
 #ifndef __ASM__
@@ -46,28 +46,28 @@
 #include <genarch/ofw/ofw_tree.h>
 
-#define TASKMAP_MAX_RECORDS	32
-#define MEMMAP_MAX_RECORDS	32
+#define TASKMAP_MAX_RECORDS  32
+#define MEMMAP_MAX_RECORDS   32
 
-#define BOOTINFO_TASK_NAME_BUFLEN 32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
 typedef struct {
-	void * addr;
-	uint32_t size;
+	void *addr;
+	size_t size;
 	char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
 
 typedef struct {
-	uint32_t count;
+	size_t cnt;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
-	uintptr_t start;
-	uint32_t size;
+	void *start;
+	size_t size;
 } memzone_t;
 
 typedef struct {
-	uint32_t total;
-	uint32_t count;
+	uint64_t total;
+	size_t cnt;
 	memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
@@ -76,4 +76,5 @@
  *
  * Must be in sync with bootinfo structure used by the boot loader.
+ *
  */
 typedef struct {
@@ -85,5 +86,6 @@
 } bootinfo_t;
 
-extern bootinfo_t bootinfo;
+extern memmap_t memmap;
+extern uintptr_t physmem_start;
 
 #endif