From 81540ef99dd5d57b577ebba4db8a77fb3f6cce3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Krzy=C5=BCanowski?= Date: Sun, 15 Sep 2024 16:41:54 +0200 Subject: [PATCH] Use kernel.bin to make iso --- build.zig | 4 ++-- src/linker.ld | 15 +-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build.zig b/build.zig index 95a2ce2..d7549f3 100644 --- a/build.zig +++ b/build.zig @@ -61,11 +61,11 @@ pub fn build(b: *std.Build) void { const iso_copy_kernel = b.addSystemCommand(&[_][]const u8{ "cp", - b.fmt("{s}/bin/{s}", .{ b.install_path, "kernel.elf" }), + b.fmt("{s}/bin/{s}", .{ b.install_path, "kernel.bin" }), iso_dir_boot_path, }); iso_copy_kernel.step.dependOn(&iso_make_dir.step); - iso_copy_kernel.step.dependOn(kernel_step_elf); + iso_copy_kernel.step.dependOn(kernel_step_bin); const iso_copy_grubcfg = b.addSystemCommand(&[_][]const u8{ "cp", diff --git a/src/linker.ld b/src/linker.ld index b96f361..d13c200 100644 --- a/src/linker.ld +++ b/src/linker.ld @@ -3,25 +3,12 @@ ENTRY(_start) SECTIONS { . = 2M; - .text : ALIGN(4K) { + .blob : ALIGN(4K) { *(.multiboot) *(.text) - } - - .rodata : ALIGN(4K) { *(.rodata) - } - - .data : ALIGN(4K) { *(.data) - } - - .bss : ALIGN(4K) { *(COMMON) *(.bss) } - - /DISCARD/ : { - *(.note .note.*) - } } \ No newline at end of file