added seastar memory mapping

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 0f98a56..ed91e6d 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -179,6 +179,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_HALT
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_APIC
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -279,6 +287,7 @@ VMM_OBJS := \
        palacios/vmm_profiler.o \
        palacios/vmm_direct_paging.o \
        palacios/vmm_ringbuffer.o \
+       palacios/vmm_hypercall.o \
        $(OBJ_FILES)
 
 #              vmx.c vmcs_gen.c vmcs.c
@@ -310,6 +319,11 @@ DEVICES_OBJS := \
        devices/bochs_debug.o \
        devices/os_debug.o \
        devices/apic.o  \
+       devices/io_apic.o \
+       devices/vpci.o \
+       devices/para_net.o \
+
+#      devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
        $(JRLDEBUG) \
@@ -328,6 +342,11 @@ V3_ARCH := __V3_32BIT__
 endif
 
 
+ifeq ($(CRAY_XT),1)
+EXTRA_C_OPTS := $(EXTRA_C_OPTS) -DCRAY_XT
+endif
+
+
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-