X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=build%2FMakefile;h=fb57c3e8451c18cb2d345a21ecbc71abd4347e55;hb=b7cb21f4a2443581074c0a3374ef9d88e72c51ce;hp=a217d7daee61f7b56a58c5e112609b0f0577b52e;hpb=746934f539c53c6fc687890c02ebf886c6873342;p=palacios.git

diff --git a/build/Makefile b/build/Makefile
index a217d7d..fb57c3e 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -51,6 +51,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_SHADOW_PAGING=0
 endif
 endif
 
+ifeq ($(DEBUG_NESTED_PAGING),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_NESTED_PAGING=1
+else 
+ifeq ($(DEBUG_NESTED_PAGING),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_NESTED_PAGING=0
+endif
+endif
+
 ifeq ($(DEBUG_CTRL_REGS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_CTRL_REGS=1
 else 
@@ -155,11 +163,32 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_DEV_MGR=0
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_APIC=1
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_APIC=0
+endif
+endif
+
+ifeq ($(DEBUG_PCI),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_PCI=1
+else 
+ifeq ($(DEBUG_PCI),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) DEBUG_PCI=0
+endif
+endif
+
 
 ifeq ($(PROFILE_VMM),1)
   GEEKOS_FLAGS:= $(GEEKOS_FLAGS) PROFILE_VMM=1
 endif
 
+ifeq ($(INSTRUMENT_VMM),1)
+  GEEKOS_FLAGS:= $(GEEKOS_FLAGS) INSTRUMENT_VMM=1
+endif
+
+
 
 # ----------------------------------------------------------------------
 # Targets -
@@ -183,6 +212,9 @@ palacios-full32:
 palacios-full64:
 	(cd $(PALACIOS_BUILD_DIR) && make ARCH=64 $(DEBUG_SECTIONS) world)	
 
+palacios-full-cray:
+	(cd $(PALACIOS_BUILD_DIR) && make V=1 ARCH=64 CRAY_XT=1 $(DEBUG_SECTIONS) world)	
+
 palacios-lean:
 	(cd $(PALACIOS_BUILD_DIR) && make LEAN_AND_MEAN=1 world)