Changeset d7ef14b in mainline for kernel/arch/arm32/src/mm/frame.c

Timestamp:

2010-06-25T20:58:06Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

12b0d51

Parents:

1590e23

Message:

Link kernel to the proper base address for gta02. Change machine_get_memory_size() to machine_get_memory_extents() and trivially implement for gta02.

File:

• kernel/arch/arm32/src/mm/frame.c (modified) (2 diffs)

kernel/arch/arm32/src/mm/frame.c

@@ -38 +38 @@
 #include <arch/machine_func.h>
 #include <config.h>
+#include <align.h>
 
 /** Address of the last frame in the memory. */
@@ -45 +46 @@
 void frame_arch_init(void)
 {
-        last_frame = machine_get_memory_size();
+        uintptr_t mem_start, mem_size;
+        uintptr_t first_frame;
+        uintptr_t num_frames;
+
+        machine_get_memory_extents(&mem_start, &mem_size);
+        first_frame = ALIGN_UP(mem_start, FRAME_SIZE);
+        last_frame = ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE);
+        num_frames = (last_frame - first_frame) >> FRAME_WIDTH;
         
         /* All memory as one zone */
-        zone_create(0, ADDR2PFN(last_frame),
+        zone_create(first_frame, num_frames,
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);