summaryrefslogtreecommitdiff
path: root/src/kernel/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/arch')
-rw-r--r--src/kernel/arch/amd64/boot.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/kernel/arch/amd64/boot.c b/src/kernel/arch/amd64/boot.c
index 2707223..2347df4 100644
--- a/src/kernel/arch/amd64/boot.c
+++ b/src/kernel/arch/amd64/boot.c
@@ -36,15 +36,17 @@ void kmain_early(struct multiboot_info *multiboot) {
info.memtop = (void*)(long)(multiboot->mem_upper * 1024);
find_init(multiboot, &info);
+ info.fb.at = (void*)multiboot->framebuffer_addr;
+ info.fb.size = multiboot->framebuffer_pitch * multiboot->framebuffer_height;
kprintf("mem...\n");
mem_init(&info);
- kprintf("rootfs...");
+ kprintf("rootfs...\n");
vfs_root_init();
ps2_init();
serial_init();
- kprintf("ata...");
+ kprintf("ata...\n");
ata_init();
vid.b = (void*)multiboot->framebuffer_addr;
@@ -54,6 +56,11 @@ void kmain_early(struct multiboot_info *multiboot) {
vid.bpp = multiboot->framebuffer_bpp;
vid.size = vid.pitch * vid.height;
+ kprintf("kernel %8x -> %8x\n", 0, &_bss_end);
+ kprintf("init %8x -> %8x\n", info.init.at, info.init.at + info.init.size);
+ kprintf("video %8x -> %8x\n", vid.b, vid.b + vid.size);
+ kprintf("limit %8x\n", info.memtop);
+
kprintf("framebuffer at 0x%x, %ux%u bpp %u\n", vid.b, vid.width, vid.height, vid.bpp);
video_init(vid);