diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-10 20:55:56 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-10 20:55:56 +0200 |
| commit | eea5bf4b859eb56c5772c58ca54937a90a10e7ee (patch) | |
| tree | 391b31a28a3740d3fd52a9a9d1c651bc9f12cc2b /src/Makefile | |
| parent | 1625a4752545e54c439a38f3393ab9d72bfee721 (diff) | |
| download | abaos-eea5bf4b859eb56c5772c58ca54937a90a10e7ee.tar.gz abaos-eea5bf4b859eb56c5772c58ca54937a90a10e7ee.tar.bz2 | |
moved bootloader to subdirectory
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 9688ebc..c89f9c3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,8 +24,8 @@ image.bin: boot.bin kernel.bin magic.bin cat image.tmp magic.bin > image.bin truncate -s 1474560 image.bin -boot.bin: boot.asm boot_gdt.asm stage1_functions.asm stage2_real_functions.asm stage2_pm_functions.asm stage2_switch_mode.asm stage2_a20.asm - $(NASM) boot.asm -DMAGIC='"$(MAGIC)"' -f bin -o boot.bin +boot.bin: boot/boot.asm boot/boot_gdt.asm boot/stage1_functions.asm boot/stage2_real_functions.asm boot/stage2_pm_functions.asm boot/stage2_switch_mode.asm boot/stage2_a20.asm + $(NASM) boot/boot.asm -DMAGIC='"$(MAGIC)"' -f bin -o boot.bin kernel.bin: kernel.elf $(OBJCOPY) -O binary kernel.elf kernel.bin @@ -41,8 +41,8 @@ kernel.elf: kernel.o kernel_asm.o console.o vgatext.o serial.o port.o port_asm.o keyboard.o mouse.o \ string.o stdlib.o stdio.o setjmp.o -magic.bin: magic.asm - $(NASM) magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin +magic.bin: boot/magic.asm + $(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin kernel.o: kernel.c $(CC) $(CFLAGS) -c -o kernel.o kernel.c |