Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1893 → Rev 1894

/trunk/boot/arch/sparc64/loader/main.c
30,7 → 30,9
#include <printf.h>
#include "asm.h"
#include "_components.h"
#include <balloc.h>
#include <ofw.h>
#include <ofw_tree.h>
#include "ofwarch.h"
#include <align.h>
 
83,12 → 85,12
for (i = 0; i < COMPONENTS; i++)
printf(" %P: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
 
void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
unsigned int top = 0;
 
printf("\nCopying components\n");
unsigned int top = 0;
bootinfo.taskmap.count = 0;
for (i = 0; i < COMPONENTS; i++) {
void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
printf(" %s...", components[i].name);
top = ALIGN_UP(top, PAGE_SIZE);
memcpy(base + top, components[i].start, components[i].size);
101,6 → 103,12
printf("done.\n");
}
 
balloc_init(&bootinfo.ballocs, ALIGN_UP(((uintptr_t) base) + top, PAGE_SIZE));
 
printf("\nCanonizing OpenFirmware device tree...");
bootinfo.ofw_root = ofw_tree_build();
printf("done.\n");
 
printf("\nBooting the kernel...\n");
jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));
}
/trunk/boot/arch/sparc64/loader/main.h
30,6 → 30,8
#define BOOT_sparc64_MAIN_H_
 
#include <ofw.h>
#include <ofw_tree.h>
#include <balloc.h>
#include <types.h>
 
#define TASKMAP_MAX_RECORDS 32
54,6 → 56,8
screen_t screen;
keyboard_t keyboard;
cpu_t cpu;
ballocs_t ballocs;
ofw_tree_node_t *ofw_root;
} bootinfo_t;
 
extern void start(void);
/trunk/boot/arch/sparc64/loader/Makefile
52,6 → 52,7
main.c \
../../../generic/printf.c \
../../../generic/string.c \
../../../genarch/balloc.c \
../../../genarch/ofw.c \
../../../genarch/ofw_tree.c \
ofwarch.c \