From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 31 Mar 2009 20:42:42 +0000 (-0500)
Subject: Merge branch 'devel' into ide
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=ee177da9b30ebf340c63fb5b9d535c729f90134d

Merge branch 'devel' into ide

Conflicts:
	misc/test_vm/build/Makefile
	palacios/build/Makefile
---

ee177da9b30ebf340c63fb5b9d535c729f90134d
diff --cc misc/test_vm/build/Makefile
index 47bd48e,62c901d..c38b9f4
--- a/misc/test_vm/build/Makefile
+++ b/misc/test_vm/build/Makefile
@@@ -38,14 -38,12 +38,15 @@@ KERNEL_ENTRY = $(SYM_PFX)Mai
  PROJECT_ROOT := ..
  VPATH := $(PROJECT_ROOT)/src
  
- #when -DNDEBUG is set the kassert functions are disabled
- #JRLDEBUG=-DNDEBUG
 -ifeq ($(DEBUG_SERIAL),1)
 -JRL_DEBUG := -DDEBUG_SERIAL
 -endif
+ 
+ 
 +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)
  ifeq ($(findstring CYGWIN,$(SYSTEM_NAME)),CYGWIN)
@@@ -178,7 -174,7 +179,8 @@@ NUMSECS := $(PERL) $(PROJECT_ROOT)/scri
  # ----------------------------------------------------------------------
  
  # Flags used for all C source files
 -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRL_DEBUG)
++
 +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG)
  CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
  
  # Flags used for kernel C source files
diff --cc palacios/build/Makefile
index 6d62c0b,9479e2b..f243949
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@@ -62,8 -62,7 +62,8 @@@ endi
  
  
  ifeq ($(DEBUG_ALL),1)
-   DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
 -  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
++  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
 +# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_IDE
  endif