X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=41515153d440cb5820679dc3bb490f34ccbbce6b;hb=68cac210354f03675feb5370dfa7fae1fb97ceee;hp=4b69f389fc15b44acfaf63379003c464830bf9bc;hpb=7841dc573457c334a0f3b6e9186d26b1776c400f;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 4b69f38..4151515 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.24 $
+# $Revision: 1.37 $
 
 # 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,11 +122,11 @@ 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_intr.c vmm_time.c\
 		vmm_shadow_paging.c vm_guest_mem.c  \
-                vmm_dev.c vmm_dev_mgr.c \
+                vm_dev.c vmm_dev_mgr.c \
 #\
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -134,11 +134,11 @@ VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
 
 VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
 
-DEVICE_C_SRCS :=  nvram.c
+DEVICE_C_SRCS :=  generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c
 
 DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
 
-DEVICE_OBJS := $(DEVICE_C_OBJS) $(VMM_ASM_OBJS)
+DEVICE_OBJS := $(DEVICE_C_OBJS)
 
 
 
@@ -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__ -D__V3_32BIT__
 
 # Flags used for VMM C ASM files
 NASM_VMM_OPTS := -I$(PROJECT_ROOT)/src/palacios/ -f elf $(EXTRA_NASM_OPTS)
@@ -259,10 +259,10 @@ palacios/%.o : palacios/%.asm
 	$(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o
 
 devices/%.o : devices/%.c
-	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o palacios/$*.o
+	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o devices/$*.o
 
 devices/%.o : devices/%.asm
-	$(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o
+	$(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -
@@ -290,10 +290,25 @@ 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 clean; make)
+#	cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
+
+force_vgabios:
+	(cd ../src/vmboot/vgabios; make clean; make)
+
+world: force_rombios force_vgabios
+	../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
 
 
 
@@ -326,7 +341,7 @@ geekos/kernel.bin : geekos/kernel.exe
 # The kernel executable and symbol map.
 geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS)
 	$(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
-		$(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS)
+		$(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS)
 	$(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms