Index: kernel/arch/ppc32/include/boot/boot.h
===================================================================
--- kernel/arch/ppc32/include/boot/boot.h	(revision a11099f830b16a1e39beb7ececec533479a22331)
+++ kernel/arch/ppc32/include/boot/boot.h	(revision 4ef117f8acd0c54154d30257a2472a276db3c765)
@@ -41,12 +41,13 @@
 #define TEMP_STACK_SIZE  0x1000
 
-#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
 
 #ifndef __ASM__
 
-#define BOOTINFO_TASK_NAME_BUFLEN 32
-
 #include <arch/types.h>
+#include <config.h>
+#include <genarch/ofw/ofw_tree.h>
 
 typedef struct {
@@ -73,21 +74,8 @@
 
 typedef struct {
-	uintptr_t addr;
-	unsigned int width;
-	unsigned int height;
-	unsigned int bpp;
-	unsigned int scanline;
-} screen_t;
-
-typedef struct {
-	uintptr_t addr;
-	unsigned int size;
-} macio_t;
-
-typedef struct {
 	memmap_t memmap;
 	taskmap_t taskmap;
-	screen_t screen;
-	macio_t macio;
+	ballocs_t ballocs;
+	ofw_tree_node_t *ofw_root;
 } bootinfo_t;