diff --git a/.gitignore b/.gitignore index aab04f3..429c21f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ bin/ *.bin *.o +os-image +*.dis diff --git a/Makefile b/Makefile index 8437214..e709b0c 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ all: os-image run: all - qemu-system-x86_64 bin/os-image + qemu-system-x86_64 os-image os-image: bootloader.bin kernel.bin - cat $^ > bin/os-image + cat $^ > os-image -kernel.bin: bin/kernel_entry.o bin/kernel.o +kernel.bin: kernel_entry.o kernel.o ld -o kernel.bin -Ttext 0x1000 $^ --oformat binary kernel.o : src/kernel/kernel.c @@ -19,7 +19,7 @@ bootloader.bin : src/bootloader/bootloader.asm nasm $< -f bin -o $@ clean: - rm -fr bin/*.bin bin/*.dis bin/*.o bin/os-image bin/*.map + rm -fr *.bin *.dis *.o os-image *.map -kernel.dis : bin/kernel.bin +kernel.dis : kernel.bin ndisasm -b 32 $< > $@