X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=861ca0b29aa917d2f19b0fc55ca3a4219e7f1f89;hb=eb87f60800c8634e37d1f8e71cd8f88605f2a46e;hp=41e56522f7730f27e52f4de2dbbb6d032b370e6f;hpb=df58bd3c484a52b1e166dc28e7b9b6fd94e5a023;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 41e5652..861ca0b 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.26 $
+# $Revision: 1.32 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -72,7 +72,7 @@ endif
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := fd.img vm_kernel
+ALL_TARGETS := vmm.img vm_kernel
 
 
 # Kernel source files
@@ -122,7 +122,7 @@ VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
 
 
 VMM_C_SRCS :=   vm_guest.c \
-	 	svm.c svm_handler.c vmm.c vmm_util.c svm_ctrl_regs.c \
+	 	svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \
 		vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
 		vmm_intr.c vmm_irq.c\
 		vmm_shadow_paging.c vm_guest_mem.c  \
@@ -134,7 +134,7 @@ VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
 
 VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
 
-DEVICE_C_SRCS :=  nvram.c timer.c
+DEVICE_C_SRCS :=  nvram.c timer.c simple_pic.c 8259a.c
 
 DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
 
@@ -211,7 +211,7 @@ CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror
 CC_KERNEL_OPTS := -g -DGEEKOS -I$(PROJECT_ROOT)/include
 
 # Flags used for VMM C source files
-CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include
+CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include -D__V3VEE__
 
 # Flags used for VMM C ASM files
 NASM_VMM_OPTS := -I$(PROJECT_ROOT)/src/palacios/ -f elf $(EXTRA_NASM_OPTS)
@@ -290,10 +290,21 @@ fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin vm_kernel
 	$(PAD) _temp 512
 	cat _temp vm_kernel > $@
 
+vmm.img : fd.img
+	cp fd.img vmm.img
+	$(PAD) vmm.img 1474560
+
+force_rombios: 
+	(cd ../src/vmboot/rombios; make)
+
+world: force_rombios
+	../scripts/make_payload.pl payload_layout.txt vm_kernel
+	make clean
+	make vmm.img
+
 # make ready to boot over PXE
-pxe:	fd.img
-	cp fd.img /tftpboot/vmm.img
-	$(PAD) /tftpboot/vmm.img 1474560
+pxe:	vmm.img
+	cp vmm.img /tftpboot/vmm.img