Index: arch/ppc32/src/mm/frame.c
===================================================================
--- arch/ppc32/src/mm/frame.c	(revision 4bb4836d109c2b794c9757cb1143351956536bad)
+++ arch/ppc32/src/mm/frame.c	(revision 40378479b8bf47b5c6ddf534dfbafae2c8441d34)
@@ -27,6 +27,6 @@
  */
 
+#include <arch/boot/boot.h>
 #include <arch/mm/frame.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
 #include <mm/frame.h>
@@ -43,7 +43,7 @@
 	size_t size;
 	
-	for (i = 0; i < memmap.count; i++) {
-		start = ADDR2PFN(ALIGN_UP(memmap.zones[i].start, FRAME_SIZE));
-		size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
+	for (i = 0; i < bootinfo.memmap.count; i++) {
+		start = ADDR2PFN(ALIGN_UP(bootinfo.memmap.zones[i].start, FRAME_SIZE));
+		size = SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, FRAME_SIZE));
 		
 		if ((minconf < start) || (minconf >= start + size))
@@ -53,6 +53,6 @@
 		
 		zone_create(start, size, conf, 0);
-		if (last_frame < ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE))
-			last_frame = ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE);
+		if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
+			last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
 	}
 
Index: arch/ppc32/src/mm/memory_init.c
===================================================================
--- arch/ppc32/src/mm/memory_init.c	(revision 4bb4836d109c2b794c9757cb1143351956536bad)
+++ arch/ppc32/src/mm/memory_init.c	(revision 40378479b8bf47b5c6ddf534dfbafae2c8441d34)
@@ -27,15 +27,13 @@
  */
 
-#include <arch/boot/memmap.h>
+#include <arch/boot/boot.h>
 #include <arch/mm/memory_init.h>
 #include <typedefs.h>
 #include <print.h>
 
-memmap_t memmap;
-
 
 size_t get_memory_size(void) 
 {
-	return memmap.total;
+	return bootinfo.memmap.total;
 }
 
@@ -45,5 +43,5 @@
 	count_t i;
 	
-	for (i = 0; i < memmap.count; i++)
-		printf("base: %L size: %L\n", memmap.zones[i].start, memmap.zones[i].size);
+	for (i = 0; i < bootinfo.memmap.count; i++)
+		printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }