diff options
author | Brett Weiland <brett_weiland@bpcspace.com> | 2021-04-18 16:00:17 -0500 |
---|---|---|
committer | Brett Weiland <brett_weiland@bpcspace.com> | 2021-04-18 16:00:17 -0500 |
commit | 774e3796b252383aafb8b3f30d51a19400c74516 (patch) | |
tree | 20ad93c125d4f6bad755e6a898ddb4259818b4fa /src/link.ld | |
parent | f0602964daa20ad9cd05f097b943c8edbf2df2e2 (diff) |
modified: src/bootloader/bios_functions/bios_disk.asm
modified: src/bootloader/bootloader.asm
new file: src/include/kernel.h
modified: src/include/libc.h
modified: src/include/paging.h
new file: src/include/panic.h
modified: src/kernel/kernel.c
modified: src/kernel/libc.c
modified: src/kernel/page.c
new file: src/kernel/panic.c
modified: src/link.ld
modified: src/makefile
modified: tools/page/page.py
Diffstat (limited to 'src/link.ld')
-rw-r--r-- | src/link.ld | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/link.ld b/src/link.ld index 3bd7273..f45ddec 100644 --- a/src/link.ld +++ b/src/link.ld @@ -9,6 +9,7 @@ printf.o page.o acpi.o kernel.o +panic.o ) _kernel_stack_loc = 0x200000 - 8; @@ -33,5 +34,5 @@ SECTIONS } } -_kernel_size = (SIZEOF(kernel) / 512) + (SIZEOF(bootloader) / 512) + 2; -_bootloader_stage1_size = (SIZEOF(bootloader) / 512) - 1; +_kernel_size = ((SIZEOF(kernel) / 512) + (SIZEOF(bootloader) / 512)); /* there's a bug here I think!*/ +_bootloader_stage1_size = (SIZEOF(bootloader) / 512); |