diff options
| author | Brett Weiland <brett_weiland@bpcspace.com> | 2021-03-24 15:36:54 -0500 |
|---|---|---|
| committer | Brett Weiland <brett_weiland@bpcspace.com> | 2021-03-24 15:38:09 -0500 |
| commit | 14b109ea24dc5cb1db948de57a2a44c80ef4622e (patch) | |
| tree | e397997d9c8d9c1b50a5a5235d38c6b0e8f24b5b /src/link.ld | |
| parent | 13000d6f44d66da795e92e4b2ddc37ce879bf275 (diff) | |
modified: README.md
modified: compiler/create_crosscompiler.sh
deleted: notes
modified: src/.gdb_history
deleted: src/amd64_vol2.pdf
modified: src/bootloader/bios_functions/bios_disk.asm
modified: src/bootloader/bios_functions/print.asm
modified: src/bootloader/bootloader.asm
modified: src/bootloader/cpu_check.asm
modified: src/bootloader/enter_kernel.asm
deleted: src/bootloader/enter_kernel_backup
modified: src/bootloader/gdt.asm
deleted: src/bootloader/multicore.asm
deleted: src/bootloader/notes
new file: src/debug/gdbinit.gdb
deleted: src/indigo_os
modified: src/kernel/include/libc.h
modified: src/kernel/include/paging.h
modified: src/kernel/include/video.h
modified: src/kernel/kernel.c
modified: src/kernel/libs/acpi.c
modified: src/kernel/libs/drivers/serial.c
modified: src/kernel/libs/drivers/video.c
modified: src/kernel/libs/libc.c
modified: src/kernel/libs/page.c
modified: src/link.ld
modified: src/makefile
new file: tools/README.md
modified: tools/page/page.py
Diffstat (limited to 'src/link.ld')
| -rw-r--r-- | src/link.ld | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/link.ld b/src/link.ld index a325c1a..3bd7273 100644 --- a/src/link.ld +++ b/src/link.ld @@ -11,12 +11,12 @@ acpi.o kernel.o ) -/*while we do need to worry about the stack converging on our kernel, -this is only temporary, and it will be more noticable then if it were to hit bios (we want to find bugs, not ignore them!)*/ -_kernel_stack_loc = 0x200000 - 16; +_kernel_stack_loc = 0x200000 - 8; _kernel_loc = 0x100000; _meminfo_loc = 0x7000; -_vbe_infoblock = 0x500; /* this does not account for segmentation to get over 0xffff*/ +_vbe_infoblock = 0x500; +_stage2_pagetable = 0x200000; +_stage1_pagetable = 0x4000; SECTIONS { |