aboutsummaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorMarvin Borner2021-03-14 16:12:44 +0100
committerGitHub2021-03-14 16:12:44 +0100
commit268f3ccdb90ab4b9bd70ca176478797aae97ca05 (patch)
tree2dbc3e52d90dab4aae8021773f09b6b72a74b8cb /kernel/Makefile
parent4309322f9d2b3e31421a3cc5399ab1f4368e0652 (diff)
parent6dec7db5158447b66f31a3f786ce2916cab83cec (diff)
Added memory management using paging
This was quite a roller-coaster and most things are slower now, but it works and is way more secure. I still need to implement things like shared memory for the WM/GUI system but other than that everything is supported.
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 9cf18e5..e9ade73 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -8,8 +8,10 @@ COBJS = main.o \
drivers/mouse.o \
drivers/pci.o \
drivers/ide.o \
+ drivers/fb.o \
drivers/timer.o \
drivers/rtl8139.o \
+ features/mm.o \
features/fs.o \
features/load.o \
features/proc.o \
@@ -34,5 +36,5 @@ all: compile
compile: $(COBJS)
@mkdir -p ../build/
- @$(LD) -N -ekernel_main -Ttext 0x00050000 -o ../build/kernel.elf -L../build/ $+ -lk
+ @$(LD) -N -z undefs -ekernel_main -Ttext 0x00050000 -o ../build/kernel.elf -L../build/ $+ -lk
@$(LD) -N -Tlink.ld -o ../build/kernel.bin -L../build/ $+ -lk