Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add infrastructure for build options

Browse source
This commit is contained in:
Sam Tebbs 2019-08-27 19:28:17 +01:00
parent 47a6dbdb5b
commit b8f0b3131c
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/kernel/kmain.zig
View file

@ -9,6 +9,7 @@ const vga = @import("vga.zig");
const log = @import("log.zig");
const serial = @import("serial.zig");
const mem = @import("mem.zig");
const options = @import("build_options");
// Need to import this as we need the panic to be in the root source file, or zig will just use the
// builtin panic and just loop, which is what we don't want
@ -31,7 +32,7 @@ pub export fn kmain(mb_info: *multiboot.multiboot_info_t, mb_magic: u32) void {
serial.init(serial.DEFAULT_BAUDRATE, serial.Port.COM1) catch unreachable;
log.logInfo("Init arch " ++ @tagName(builtin.arch) ++ "\n");
arch.init(&mem_profile, &fixed_allocator.allocator);
arch.init(&mem_profile, &fixed_allocator.allocator, options);
log.logInfo("Arch init done\n");
vga.init();
tty.init();