From e47f8666ec59b9726cc0daee98872bdc4ea6fe3e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 14 May 2017 18:41:09 +0200 Subject: added a simple kernel console which can use VGA and the first serial port for output (no terminal emulation, only sequential output) shows how to intermix VGA animations and line-orinented console output --- src/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index fed5c71..52a628b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,9 +18,10 @@ image.bin: boot.bin kernel.bin magic.bin boot.bin: boot.asm gdt.asm stage1_functions.asm stage2_functions.asm switch_mode.asm nasm boot.asm -f bin -o boot.bin -kernel.bin: kernel.o vga.o serial.o port.o port_asm.o string.o stdlib.o +kernel.bin: kernel.o console.o vga.o serial.o port.o port_asm.o string.o stdlib.o $(LD) -o kernel.bin -N -n -Ttext 0x8400 --oformat binary \ - kernel.o vga.o serial.o port.o port_asm.o string.o stdlib.o + kernel.o console.o vga.o serial.o port.o port_asm.o \ + string.o stdlib.o magic.bin: magic.asm nasm magic.asm -f bin -o magic.bin @@ -31,6 +32,9 @@ kernel.o: kernel.c port.o: port.c port.h $(CC) $(CFLAGS) -c -o port.o port.c +console.o: console.c console.h vga.h serial.h + $(CC) $(CFLAGS) -c -o console.o console.c + vga.o: vga.c vga.h $(CC) $(CFLAGS) -c -o vga.o vga.c -- cgit v1.2.3-54-g00ecf