diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-12 11:47:56 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-12 11:47:56 +0200 |
| commit | 3adae629e98f9fd256349b291e89e6f63c5e469e (patch) | |
| tree | c22c099c0f6acd732242b96a7844cb072f091416 /src/Makefile | |
| parent | cdd32146693561ed5b025e6c8a866370402ce380 (diff) | |
| download | abaos-3adae629e98f9fd256349b291e89e6f63c5e469e.tar.gz abaos-3adae629e98f9fd256349b291e89e6f63c5e469e.tar.bz2 | |
sorted out the character constant mess: we have a flat model (with GDT)
starting from 0x8000, but the first 2k are stage 2 of the boot loader,
so out kernel entry is 0x8400. We have to tell ld that and use 0x8400
instead of 0x8000, otherwise all string constants point to Nirvana!
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 45db0f7..e0dfedb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ boot.bin: boot.asm gdt.asm stage1_functions.asm stage2_functions.asm switch_mode nasm boot.asm -f bin -o boot.bin kernel.bin: kernel.o vga.o port.o port_asm.o string.o stdlib.o - $(LD) -o kernel.bin -n -Ttext 0x8000 --oformat binary \ + $(LD) -o kernel.bin -N -n -Ttext 0x8400 --oformat binary \ kernel.o vga.o port.o port_asm.o string.o stdlib.o magic.bin: magic.asm |