PROJECT_ROOT := ..
VPATH := $(PROJECT_ROOT)/src
-#when -DNDEBUG is set the kassert functions are disabled
-#JRLDEBUG=-DNDEBUG
-JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=1000 -DSERIAL_PRINT=1
-#
-#
-#Peter's compile flags
-PAD=
+
+ifeq ($(SERIAL_DEBUG), 1)
+JRLDEBUG= -DDEBUG_SERIAL
+else
+JRLDEBUG=
+endif
+
# Figure out if we're compiling with cygwin, http://cygwin.com
SYSTEM_NAME := $(shell uname -s)
gdt.c tss.c segment.c \
bget.c malloc.c \
synch.c kthread.c \
+ vm_cons.c debug.c \
+ pci.c \
serial.c reboot.c \
paging.c \
main.c
# ----------------------------------------------------------------------
# Flags used for all C source files
-GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS)
+
+GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG)
CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror
# Flags used for kernel C source files
cat geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin > $@
-# make ready to boot over PXE
-pxe: fd.img
- cp fd.img /tftpboot/vmm.img
- $(PAD) /tftpboot/vmm.img 1474560
-
-
-vm: geekos/kernel.bin
- cp geekos/kernel.bin ../../vmm-hack1/build/vm_kernel
-guest_img: fd.img
+guest-img: fd.img
cp fd.img guest.img
$(PAD) guest.img 1474560
-geekos/test: geekos/test.o
- $(CC) geekos/test.o -o geekos/test
+guest-iso: guest-img
+ mkisofs -pad -b guest.img -R -o guest.iso guest.img