Updated to include improved 8254

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 741c1fd..812d4c9 100644 (file)
--- 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.35 $
+# $Revision: 1.40 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -85,7 +85,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
@@ -126,7 +126,8 @@ VMM_C_SRCS :=   vm_guest.c \
                vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.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
 
@@ -295,11 +296,15 @@ vmm.img : fd.img
        $(PAD) vmm.img 1474560
 
 force_rombios: 
-       (cd ../src/vmboot/rombios; make)
+       (cd ../src/vmboot/rombios; make clean; make)
+#      cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
 
-world: force_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 clean
        make vmm.img
 
 # make ready to boot over PXE