From 04104fc051d44f4f9b3328f29b4be91fa4060f34 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 28 Apr 2021 23:12:17 +0200
Subject: Started conversion to Grub (#17)

Yes, the CI won't like this.
---
 kernel/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kernel/Makefile')

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
-- 
cgit v1.2.3