X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=8fa36efea45b9785d1a00849206e49c886542ad7;hb=73ce005b59a3c032c7a4f64bce17f6eb1bf8ea20;hp=be6aaaf335e1b6a3e8825702cd95c93f602ed1a9;hpb=4b93282ac2e60cd4d74b1e0be8ac758933140413;p=palacios.releases.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index be6aaaf..8fa36ef 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -1,6 +1,15 @@ # Makefile for GeekOS kernel, userspace, and tools +# +# Northwestern University +# (c) 2008, Jack Lange +# (c) 2008, Peter Dinda +# (c) 2008, Lei Xia +# (c) 2008, The V3VEE Project +# +# Based on GeekOS Makefile: # Copyright (c) 2004,2005 David H. Hovemeyer -# $Revision: 1.62 $ +# $Revision: 1.71 $ + # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -49,43 +58,100 @@ DEBUG=1 DEBUG_SECTIONS= ifeq ($(DEBUG_ALL),1) - DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC + DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK endif + ifeq ($(DEBUG_SHADOW_PAGING),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING +else +ifeq ($(DEBUG_SHADOW_PAGING),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING +endif endif + ifeq ($(DEBUG_CTRL_REGS),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_CTRL_REGS +else +ifeq ($(DEBUG_CTRL_REGS),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_CTRL_REGS +endif endif + ifeq ($(DEBUG_INTERRUPTS),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS +else +ifeq ($(DEBUG_DEBUG_INTERRUPTS),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_INTERRUPTS endif +endif + ifeq ($(DEBUG_IO),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IO +else +ifeq ($(DEBUG_IO),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IO endif +endif + ifeq ($(DEBUG_KEYBOARD),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_KEYBOARD +else +ifeq ($(DEBUG_KEYBOARD),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_KEYBOARD +endif endif + ifeq ($(DEBUG_PIC),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIC +else +ifeq ($(DEBUG_PIC),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIC +endif endif + ifeq ($(DEBUG_PIT),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIT +else +ifeq ($(DEBUG_PIT),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIT +endif endif + ifeq ($(DEBUG_NVRAM),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NVRAM +else +ifeq ($(DEBUG_NVRAM),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NVRAM endif +endif + ifeq ($(DEBUG_GENERIC),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_GENERIC +else +ifeq ($(DEBUG_GENERIC),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_GENERIC endif +endif + ifeq ($(DEBUG_EMULATOR),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_EMULATOR +else +ifeq ($(DEBUG_EMULATOR),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR +endif endif + ifeq ($(DEBUG_RAMDISK),1) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK +else +ifeq ($(DEBUG_RAMDISK),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK +endif endif +#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K + 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 $(DEBUG_SECTIONS) @@ -115,7 +181,12 @@ endif # #TCPSTACK, uIP is used currently # -TCPSTACK=UIP +UIP=ON + +# +#LWIP, ON -- used, OFF -- not used +# +LWIP=ON # #RAMDISK @@ -173,8 +244,10 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \ serial.c reboot.c \ paging.c \ debug.c vmm_stubs.c vm.c pci.c\ + queue.c socket.c net.c ring_buffer.c \ main.c + # Kernel object files built from C source files KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o) @@ -216,7 +289,7 @@ VMM_C_SRCS := vm_guest.c \ vm_dev.c vmm_dev_mgr.c vmm_decoder.c \ svm_halt.c svm_pause.c svm_wbinvd.c \ vmm_config.c vmm_hashtable.c \ - vmm_string.c vmm_emulator.c \ + vmm_string.c vmm_emulator.c vmm_queue.c\ $(DECODER_SRCS) # vmx.c vmcs_gen.c vmcs.c @@ -236,11 +309,23 @@ DEVICE_OBJS := $(DEVICE_C_OBJS) V3LIBS := $(DECODER_LIBS) -TCPSTACK_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c -TCPSTACK_C_OBJS := $(TCPSTACK_C_SRCS:%.c=net/%.o) -TCPSTACK_OBJS := $(TCPSTACK_C_OBJS) +ifeq ($(UIP),ON) + UIP_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c + UIP_C_OBJS := $(UIP_C_SRCS:%.c=net/%.o) +else + UIP_C_SRCS := + UIP_C_OBJS := +endif + +ifeq ($(LWIP),ON) + LWIP_OBJS := lwip/*.o +else + LWIP_OBJS := +endif + +TCPSTACK_OBJS := $(UIP_C_OBJS) $(LWIP_OBJS) @@ -371,7 +456,7 @@ devices/%.o : devices/%.asm $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o net/%.o : net/%.c - $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $(CC_USER_OPTS) $< -o net/$*.o + $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_USER_OPTS) $< -o net/$*.o # ---------------------------------------------------------------------- # Targets - @@ -403,16 +488,25 @@ vmm.img : fd.img cp fd.img vmm.img $(PAD) vmm.img 1474560 -force_rombios: +rombios_link: + ln -s -f ../src/vmboot/rombios/BIOS-bochs-latest rombios + +vgabios_link: + ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios + +force_lwip: + (cd ../src/lwip/build; make clean; make) + +force_rombios: rombios_link (cd ../src/vmboot/rombios; make clean; make) -force_vgabios: +force_vgabios: vgabios_link (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 +inter1: force_payload force_lwip -make clean world: inter1 vmm.img