diff options
| author | Marvin Borner | 2021-04-28 23:12:17 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-28 23:12:17 +0200 |
| commit | 04104fc051d44f4f9b3328f29b4be91fa4060f34 (patch) | |
| tree | 1677c1739c44bd7c7e8722ea00ca3c6b45158c85 /kernel/Makefile | |
| parent | 895a58b1b57a0ae8028576404a90f12e0133cf5f (diff) | |
Started conversion to Grub (#17)
Yes, the CI won't like this.
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 60b4ee7..e51469d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,6 +1,8 @@ # MIT License, Copyright (c) 2020 Marvin Borner # acpi.o fpu.o -COBJS = main.o \ +COBJS = entry_asm.o \ + main.o \ + multiboot.o \ drivers/interrupts.o \ drivers/interrupts_asm.o \ drivers/cpu.o \ @@ -37,4 +39,4 @@ all: compile compile: $(COBJS) @mkdir -p $(BUILD)/apps/kernel/ - @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o $(BUILD)/apps/kernel/exec -L$(BUILD) $+ -lk + @$(LD) -N -z max-page-size=0x1000 -eboot_entry -Tlink.ld -o $(BUILD)/apps/kernel/exec -L$(BUILD) $+ -lk |