Changeset 96e0748d in mainline for boot/arch/mips32/loader/main.c

Timestamp:

2009-02-17T22:47:27Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f89979b

Parents:

e662a5f

Message:

make arch_pre_main optional, don't force any specific prototype
simplify boot process
mips32: detect number of configured CPUs in msim

File:

• boot/arch/mips32/loader/main.c (modified) (3 diffs)

boot/arch/mips32/loader/main.c

@@ -29 +29 @@
 #include "main.h" 
 #include <printf.h>
+#include <align.h>
 #include <macros.h>
 #include "msim.h"
@@ -74 +75 @@
         
         printf("\nCopying components\n");
+        
         unsigned int top = 0;
         bootinfo.cnt = 0;
-        for (i = 0; i < COMPONENTS; i++) {
+        for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 printf(" %s...", components[i].name);
                 top = ALIGN_UP(top, PAGE_SIZE);
@@ -89 +91 @@
         }
         
+        unsigned int *cpumap = (unsigned int *) CPUMAP;
+        bootinfo.cpumap = 0;
+        for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
+                if (cpumap[i] != 0)
+                        bootinfo.cpumap |= (1 << i);
+        }
+        
         printf("\nBooting the kernel...\n");
-        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));
+        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo);
 }