| 36,6 → 36,7 |
|---|
| #include <ofw_tree.h> |
| #include "ofwarch.h" |
| #include <align.h> |
| #include <macros.h> |
| #include <string.h> |
| |
| bootinfo_t bootinfo; |
| 42,16 → 43,16 |
|---|
| |
| component_t components[COMPONENTS]; |
| |
| 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 |
| 142,8 → 143,8 |
|---|
| silo_ramdisk_image += bootinfo.physmem_start; |
| silo_ramdisk_image -= 0x400000; |
| /* Install 1:1 mapping for the ramdisk. */ |
| if (ofw_map((void *)((uintptr_t)silo_ramdisk_image), |
| (void *)((uintptr_t)silo_ramdisk_image), |
| if (ofw_map((void *)((uintptr_t) silo_ramdisk_image), |
| (void *)((uintptr_t) silo_ramdisk_image), |
| silo_ramdisk_size, -1) != 0) { |
| printf("Failed to map ramdisk.\n"); |
| halt(); |
| 178,6 → 179,9 |
|---|
| base + top; |
| bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = |
| components[i].size; |
| strncpy(bootinfo.taskmap.tasks[ |
| bootinfo.taskmap.count].name, components[i].name, |
| BOOTINFO_TASK_NAME_BUFLEN); |
| bootinfo.taskmap.count++; |
| } |
| top += components[i].size; |
| 203,7 → 207,8 |
|---|
| * given to us by SILO. |
| */ |
| (void) ofw_claim_phys(base + top, silo_ramdisk_size); |
| (void) ofw_map(base + top, base + top, silo_ramdisk_size, -1); |
| (void) ofw_map(bootinfo.physmem_start + base + top, base + top, |
| silo_ramdisk_size, -1); |
| memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image), |
| silo_ramdisk_size); |
| printf("done.\n"); |
| 253,7 → 258,8 |
|---|
| balloc_base = base + ALIGN_UP(top, PAGE_SIZE); |
| (void) ofw_claim_phys(bootinfo.physmem_start + balloc_base, |
| BALLOC_MAX_SIZE); |
| (void) ofw_map(balloc_base, balloc_base, BALLOC_MAX_SIZE, -1); |
| (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base, |
| BALLOC_MAX_SIZE, -1); |
| balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base); |
| |
| printf("\nCanonizing OpenFirmware device tree..."); |
| 260,7 → 266,7 |
|---|
| bootinfo.ofw_root = ofw_tree_build(); |
| printf("done.\n"); |
| |
| #ifdef CONFIG_SMP |
| #ifdef CONFIG_AP |
| printf("\nChecking for secondary processors..."); |
| if (!ofw_cpu()) |
| printf("Error: unable to get CPU properties\n"); |
| 267,7 → 273,7 |
|---|
| printf("done.\n"); |
| #endif |
| |
| setup_palette(); |
| ofw_setup_palette(); |
| |
| printf("\nBooting the kernel...\n"); |
| jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, |
| 274,4 → 280,3 |
|---|
| bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, |
| sizeof(bootinfo)); |
| } |
| |