aboutsummaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorMarvin Borner2021-04-05 00:20:13 +0200
committerMarvin Borner2021-04-05 00:20:13 +0200
commit248c0d2fd007eeeb108ff1a88924e3ef8ff84ba4 (patch)
treeca7a73c76e423d44e739228ddaa4a408af9ca526 /kernel/Makefile
parent614df32883bd988a59ce1a2a201ce2dd8211ab3a (diff)
Made kernel elf-bootable
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 8970c1b..e4b181c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -8,6 +8,7 @@ COBJS = main.o \
drivers/keyboard.o \
drivers/mouse.o \
drivers/pci.o \
+ drivers/rtc.o \
drivers/ide.o \
drivers/fb.o \
drivers/timer.o \
@@ -34,6 +35,5 @@ all: compile
@$(AS) $(ASFLAGS) $< -o $@
compile: $(COBJS)
- @mkdir -p ../build/
- @$(LD) -N -z undefs -ekernel_main -Ttext 0x00009000 -o ../build/kernel.elf -L../build/ $+ -lk
- @$(LD) -N -z max-page-size=0x1000 -Tlink.ld -o ../build/kernel.bin -L../build/ $+ -lk
+ @mkdir -p ../build/apps/
+ @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o ../build/apps/kernel -L../build/ $+ -lk