Changeset 25a76ab8 in mainline for kernel/arch/sparc64/src/sun4u/sparc64.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/sun4u/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -36 +36 @@
 #include <debug.h>
 #include <config.h>
+#include <macros.h>
 #include <arch/trap/trap.h>
 #include <arch/console.h>
@@ -50 +51 @@
 #include <str.h>
 
-bootinfo_t bootinfo;
+memmap_t memmap;
 
 /** Perform sparc64-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
+void arch_pre_main(bootinfo_t *bootinfo)
 {
         /* Copy init task info. */
-        init.cnt = bootinfo.taskmap.count;
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
         
-        uint32_t i;
-
-        for (i = 0; i < bootinfo.taskmap.count; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo.taskmap.tasks[i].addr;
-                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-                    bootinfo.taskmap.tasks[i].name);
+                    bootinfo->taskmap.tasks[i].name);
+        }
+        
+        /* Copy physical memory map. */
+        memmap.total = bootinfo->memmap.total;
+        memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS);
+        for (i = 0; i < memmap.cnt; i++) {
+                memmap.zones[i].start = bootinfo->memmap.zones[i].start;
+                memmap.zones[i].size = bootinfo->memmap.zones[i].size;
         }
         
         /* Copy boot allocations info. */
-        ballocs.base = bootinfo.ballocs.base;
-        ballocs.size = bootinfo.ballocs.size;
+        ballocs.base = bootinfo->ballocs.base;
+        ballocs.size = bootinfo->ballocs.size;
         
-        ofw_tree_init(bootinfo.ofw_root);
+        ofw_tree_init(bootinfo->ofw_root);
 }