Add linker script and partial VGA driver

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index 7001c99b6359d03cd4b26c934e903e2b0079e473..c895701d2b911f6517b90be5d4b4fd8cbea6cfcb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ AS = yasm
 LD = i686-elf-ld
 CC = i686-elf-gcc
 
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
+
 all: boot.img
 
 boot.img: boot kernel/kernel.bin
@@ -11,16 +13,19 @@ boot.img: boot kernel/kernel.bin
 boot: boot.s
        $(AS) -f bin boot.s -o $@
 
-kernel/kernel.bin: kernel/entry.o kernel/kernel.o
-       $(LD) -o $@ -Ttext 0x1000 kernel/entry.o kernel/kernel.o --oformat=binary
+kernel/kernel.bin: ${KERNEL_OBJ}
+       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
 
 kernel/entry.o: kernel/entry.s
        $(AS) -f elf kernel/entry.s -o $@
 
+kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
+       $(CC) -o $@ -ffreestanding -c kernel/arch/x86/tty/tty.c
+
 kernel/kernel.o: kernel/kernel.c
-       $(CC) -o $@ -ffreestanding -c kernel/kernel.c
+       $(CC) -o $@ -Iinclude/arch/x86 -ffreestanding -c kernel/kernel.c
 
 clean:
-       rm boot kernel/kernel.bin kernel/entry.o kernel/kernel.o boot.img
+       rm boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
 
 .PHONY: all clean