X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=e3b62695940652fe9ab7d9d0dda8e53992623de3;hb=6f8e1e8902d5abe9286e723468daa80fe0ee42aa;hp=c79201e3f8e08a847ebe34c86ea272d8a3572b2c;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index c79201e..e3b6269 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 -# $Revision: 1.22 $ +# $Revision: 1.44 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -41,22 +41,34 @@ VPATH := $(PROJECT_ROOT)/src #when -DNDEBUG is set the kassert functions are disabled #JRLDEBUG=-DNDEBUG -JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 + +DEBUG=1 + +ifeq ($(DEBUG),1) + JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 -DVMM_DEBUG=1 -DVMM_INFO=1 -DVMM_TRACE=1 +else + JRLDEBUG= -DSERIAL_PRINT_DEBUG=0 -DSERIAL_PRINT_DEBUG_LEVEL=999999 -DSERIAL_PRINT=0 -DVMM_DEBUG=0 -DVMM_INFO=0 -DVMM_TRACE=0 +endif # # #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 +84,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 +97,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,15 +134,25 @@ 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_shadow_paging.c vm_guest_mem.c #\ + vmm_intr.c vmm_time.c\ + vmm_shadow_paging.c vm_guest_mem.c \ + vm_dev.c vmm_dev_mgr.c vmm_decoder.c \ + svm_halt.c svm_pause.c +#\ # vmx.c vmcs_gen.c vmcs.c VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o) VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS) +DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c + +DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) + +DEVICE_OBJS := $(DEVICE_C_OBJS) + # ---------------------------------------------------------------------- @@ -202,7 +224,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) @@ -249,6 +271,12 @@ palacios/%.o : palacios/%.c 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 devices/$*.o + +devices/%.o : devices/%.asm + $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o + # ---------------------------------------------------------------------- # Targets - # Specifies files to be built @@ -275,10 +303,31 @@ 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) + +force_vgabios: + (cd ../src/vmboot/vgabios; make clean; make) + +force_payload: force_rombios force_vgabios + ../scripts/make_payload.pl payload_layout.txt vm_kernel + +inter1: force_payload + -make clean + +world: inter1 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 + +run: vmm.img + /usr/local/qemu/bin/qemu-system-x86_64 -m 1024 -serial file:serial.out -cdrom puppy.iso -fda vmm.img + @@ -309,9 +358,9 @@ geekos/kernel.bin : geekos/kernel.exe $(PAD) $@ 512 # The kernel executable and symbol map. -geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) +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 @@ -327,7 +376,7 @@ vm_kernel: force # Clean build directories of generated files clean : - for d in geekos common libc user tools palacios; do \ + for d in geekos common libc user tools palacios devices; do \ (cd $$d && rm -f *); \ done @@ -347,6 +396,10 @@ depend : $(GENERATED_LIBC_SRCS) $(VMM_C_SRCS:%.c=$(PROJECT_ROOT)/src/palacios/%.c) \ | $(PERL) -n -e 's,^(\S),palacios/$$1,;print' \ >> depend.mak + $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \ + $(DEVICE_C_SRCS:%.c=$(PROJECT_ROOT)/src/devices/%.c) \ + | $(PERL) -n -e 's,^(\S),devices/$$1,;print' \ + >> depend.mak # By default, there are no header file dependencies. depend.mak :