X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=5df84e88036d7a6e1dec691db8fd4c4a18e48999;hb=c1e082c26ab3f0b7cc183a7709f90ef4c3f7ad3d;hp=95b2af2964cea0dccf4df5a3def1950ec7d5802a;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010;p=palacios.releases.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 95b2af2..5df84e8 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.25 $
+# $Revision: 1.41 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -48,15 +48,20 @@ JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1
 #Peter's compile flags
 PADFLAGS =
 
+#
+# This is wrong for current cygwin - no changes needed
+#
 # Figure out if we're compiling with cygwin, http://cygwin.com
-SYSTEM_NAME := $(shell uname -s)
-ifeq ($(findstring CYGWIN,$(SYSTEM_NAME)),CYGWIN)
-SYM_PFX            := _
-EXTRA_C_OPTS       := -DNEED_UNDERSCORE -DGNU_WIN32
-EXTRA_NASM_OPTS    := -DNEED_UNDERSCORE
-NON_ELF_SYSTEM     := yes
-EXTRA_CC_USER_OPTS := -Dmain=geekos_main
-endif
+#
+# 
+#SYSTEM_NAME := $(shell uname -s)
+#ifeq ($(findstring CYGWIN,$(SYSTEM_NAME)),CYGWIN)
+#SYM_PFX            := _
+#EXTRA_C_OPTS       := -DNEED_UNDERSCORE -DGNU_WIN32
+#EXTRA_NASM_OPTS    := -DNEED_UNDERSCORE
+#NON_ELF_SYSTEM     := yes
+#EXTRA_CC_USER_OPTS := -Dmain=geekos_main
+#endif
 
 
 
@@ -72,7 +77,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
@@ -85,7 +90,7 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
 	synch.c kthread.c \
 	serial.c  reboot.c \
         paging.c \
-	debug.c vmm_stubs.c  vm.c\
+	debug.c vmm_stubs.c  vm.c  pci.c\
 	main.c
 
 # Kernel object files built from C source files
@@ -122,11 +127,12 @@ 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  \
-                vm_dev.c vmm_dev_mgr.c \
+                vm_dev.c vmm_dev_mgr.c vmm_decoder.c \
+                svm_halt.c 
 #\
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -134,7 +140,7 @@ 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)
 
@@ -211,7 +217,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)
@@ -290,10 +296,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