Changeset 4bb4836d in mainline

Timestamp:

2006-03-14T11:34:13Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5be1923

Parents:

06e6805

Message:

ppc32: move kernel one frame up
frame zones initialization

Location:

arch/ppc32

Files:

• include/boot/boot.h (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)

arch/ppc32/include/boot/boot.h

@@ -30 +30 @@
 #define __ppc32_BOOT_H__
 
-#define BOOT_OFFSET             0x1000
+#define BOOT_OFFSET             0x2000
 
 #endif

arch/ppc32/src/mm/frame.c

@@ -28 +28 @@
 
 #include <arch/mm/frame.h>
+#include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
 #include <mm/frame.h>
+#include <align.h>
+#include <macros.h>
+
+__address last_frame = 0;
 
 void frame_arch_init(void)
 {
+        pfn_t minconf = 2;
+        count_t i;
+        pfn_t start, conf;
+        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));
+                
+                if ((minconf < start) || (minconf >= start + size))
+                        conf = start;
+                else
+                        conf = minconf;
+                
+                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);
+        }
+
         /* First is exception vector, second is 'implementation specific' */
         frame_mark_unavailable(0, 2);
+        
+        /* Merge all zones to 1 big zone */
+        zone_merge_all();
 }