| 28,6 → 28,9 |
|---|
| |
| #include "main.h" |
| #include <printf.h> |
| #include <align.h> |
| #include <macros.h> |
| #include <string.h> |
| #include "msim.h" |
| #include "asm.h" |
| #include "_components.h" |
| 34,16 → 37,16 |
|---|
| |
| #define KERNEL_VIRTUAL_ADDRESS 0x80100000 |
| |
| char *release = RELEASE; |
| char *release = STRING(RELEASE); |
| |
| #ifdef REVISION |
| char *revision = ", revision " REVISION; |
| char *revision = ", revision " STRING(REVISION); |
| #else |
| char *revision = ""; |
| #endif |
| |
| #ifdef TIMESTAMP |
| char *timestamp = "\nBuilt on " TIMESTAMP; |
| char *timestamp = "\nBuilt on " STRING(TIMESTAMP); |
| #else |
| char *timestamp = ""; |
| #endif |
| 59,9 → 62,10 |
|---|
| version_print(); |
| |
| component_t components[COMPONENTS]; |
| bootinfo_t bootinfo; |
| init_components(components); |
| |
| bootinfo_t bootinfo; |
| |
| printf("\nMemory statistics\n"); |
| printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS); |
| printf(" %L: boot info structure\n", &bootinfo); |
| 71,9 → 75,10 |
|---|
| printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size); |
| |
| 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); |
| memcpy(((void *) KERNEL_VIRTUAL_ADDRESS) + top, components[i].start, components[i].size); |
| 80,6 → 85,8 |
|---|
| if (i > 0) { |
| bootinfo.tasks[bootinfo.cnt].addr = ((void *) KERNEL_VIRTUAL_ADDRESS) + top; |
| bootinfo.tasks[bootinfo.cnt].size = components[i].size; |
| strncpy(bootinfo.tasks[bootinfo.cnt].name, |
| components[i].name, BOOTINFO_TASK_NAME_BUFLEN); |
| bootinfo.cnt++; |
| } |
| top += components[i].size; |
| 86,6 → 93,13 |
|---|
| printf("done.\n"); |
| } |
| |
| 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); |
| } |