X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=1e55a2d8279a8d4802fdaf171ea57af732128db1;hb=1136ff005017b791572f5f2fa2b2f846a04817e7;hp=de620950b153df339da5aa50ee7e4c4d4a0b8f57;hpb=245f2cf869618c082cf5141786c8a9d6d82a63be;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index de62095..1e55a2d 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -62,8 +62,7 @@ endif 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 -# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK + 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 -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK endif @@ -271,6 +270,7 @@ VMM_OBJS := \ palacios/vmm_debug.o \ palacios/svm_io.o \ palacios/vmm_intr.o \ + palacios/vmm_excp.o \ palacios/vmm_time.o \ palacios/vmm_shadow_paging.o \ palacios/vm_guest_mem.o \ @@ -528,13 +528,7 @@ vgabios_link: ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios -force_rombios: rombios_link - (cd ../src/vmboot/rombios; make clean; make) - -force_vgabios: vgabios_link - (cd ../src/vmboot/vgabios; make clean; make) - -force_payload: force_rombios force_vgabios +force_payload: rombios_link vgabios_link ../scripts/make_payload.pl payload_layout.txt vm_kernel inter1: force_payload