originalmk/zig-bare-bones
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use kernel.bin to make iso

Browse Source
This commit is contained in:
Maciej Krzyżanowski 2024-09-15 16:41:54 +02:00
parent 176bc66f66
commit 81540ef99d
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig
View File

@ -61,11 +61,11 @@ pub fn build(b: *std.Build) void {
const iso_copy_kernel = b.addSystemCommand(&[_][]const u8{ const iso_copy_kernel = b.addSystemCommand(&[_][]const u8{
"cp", "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_dir_boot_path,
}); });
iso_copy_kernel.step.dependOn(&iso_make_dir.step); 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{ const iso_copy_grubcfg = b.addSystemCommand(&[_][]const u8{
"cp", "cp",

15
src/linker.ld
View File

@ -3,25 +3,12 @@ ENTRY(_start)
SECTIONS { SECTIONS {
. = 2M; . = 2M;
.text : ALIGN(4K) { .blob : ALIGN(4K) {
*(.multiboot) *(.multiboot)
*(.text) *(.text)
}
.rodata : ALIGN(4K) {
*(.rodata) *(.rodata)
}
.data : ALIGN(4K) {
*(.data) *(.data)
}
.bss : ALIGN(4K) {
*(COMMON) *(COMMON)
*(.bss) *(.bss)
} }
/DISCARD/ : {
*(.note .note.*)
}
} }