diff --git a/Makefile b/Makefile index 3bbe8e3..cf209fe 100644 --- a/Makefile +++ b/Makefile @@ -29,11 +29,11 @@ CFLAGS += -I. CFLAGS += -I./kern CFLAGS += -I./kern/libkern -all: kernel.elf +all: kern/kernel.elf main: main.o -kernel.elf: kern/entry.o kern/start.o kern/libkern/string.o kern/libkern/proc.o kern/libkern/uart.o kern/libkern/panic.o kern/kalloc.o kern/libkern/memory.o kern/ispinlock.o kern/libkern/spinlock.o kern/libkern/string.o kern/libkern/mini-printf.o +kern/kernel.elf: kern/entry.o kern/start.o kern/libkern/string.o kern/libkern/proc.o kern/libkern/uart.o kern/libkern/panic.o kern/kalloc.o kern/libkern/memory.o kern/ispinlock.o kern/libkern/spinlock.o kern/libkern/string.o kern/libkern/mini-printf.o @echo LD $@ @$(LD) $(LDFLAGS) -o $@ $^ @@ -45,7 +45,7 @@ kernel.elf: kern/entry.o kern/start.o kern/libkern/string.o kern/libkern/proc.o @echo AS $@ @$(AS) $(ASFLAGS) -o $@ $< -qemu: kernel.elf +qemu: kern/kernel.elf @echo QEMU $< @qemu-system-riscv64 -machine virt -bios none -nographic -m 128M -smp 4 -kernel kernel.elf