diff --git a/bootle/package.nix b/bootle/package.nix index a5de5eb..822cf89 100644 --- a/bootle/package.nix +++ b/bootle/package.nix @@ -37,7 +37,7 @@ in (naersk'.buildPackage { -e _start \ target/x86_64-unknown-none/release/libbootle.a - dd if=/dev/zero of=disk bs=512 count=2 + dd if=/dev/zero of=disk bs=512 count=2880 dd if=${bootler}/bin/boot.bin of=disk conv=notrunc dd if=kernel.bin of=disk bs=512 seek=1 conv=notrunc diff --git a/bootler/asm/boot.asm b/bootler/asm/boot.asm index 5291d58..85b9a63 100644 --- a/bootler/asm/boot.asm +++ b/bootler/asm/boot.asm @@ -6,7 +6,7 @@ LOAD_ADDR equ 0x7C00 KERNEL_START equ 2 ; first sector on disk to load kernel from; 1 indexed -KERNEL_SIZE equ 1 ; length of kernel in sectors +KERNEL_SIZE equ 16 ; length of kernel in sectors KERNEL_LOAD_ADDR_ES equ 0x1000 ; kernel to be loaded at es * 0x10 + 0x0000 PAGE_TABLE_LOAD_ADDR equ 0x1000 ; start of page table; 4 * pt size