X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=8fa36efea45b9785d1a00849206e49c886542ad7;hb=73ce005b59a3c032c7a4f64bce17f6eb1bf8ea20;hp=594c11da5a8036b52c7fce4098c7acd3627acd42;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 594c11d..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.54 $ +# $Revision: 1.71 $ + # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -49,33 +58,99 @@ 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 + 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) @@ -103,6 +178,28 @@ else # This is an error endif +# +#TCPSTACK, uIP is used currently +# +UIP=ON + +# +#LWIP, ON -- used, OFF -- not used +# +LWIP=ON + +# +#RAMDISK +# +RAMDISK_SRCS= +BOOT_FLAGS= + +ifeq ($(RAMDISK_BOOT),1) +BOOT_FLAGS := $(BOOT_FLAGS) -DRAMDISK_BOOT +RAMDISK_SRCS := ramdisk.c cdrom.c +endif + + # # This is wrong for current cygwin - no changes needed @@ -138,7 +235,7 @@ ALL_TARGETS := vmm.img vm_kernel # Kernel source files KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \ - blockdev.c ide.c \ + blockdev.c ide.c ne2k.c \ keyboard.c screen.c timer.c \ mem.c crc32.c \ gdt.c tss.c segment.c \ @@ -147,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) @@ -188,10 +287,10 @@ VMM_C_SRCS := vm_guest.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 vmm_config.c vmm_hashtable.c \ - vmm_string.c \ + svm_halt.c svm_pause.c svm_wbinvd.c \ + vmm_config.c vmm_hashtable.c \ + vmm_string.c vmm_emulator.c vmm_queue.c\ $(DECODER_SRCS) -#\ # vmx.c vmcs_gen.c vmcs.c VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o) @@ -201,7 +300,7 @@ 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_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c $(RAMDISK_SRCS) DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) @@ -211,6 +310,26 @@ V3LIBS := $(DECODER_LIBS) + +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) + + + + # ---------------------------------------------------------------------- # Tools - # This section defines programs that are used to build GeekOS. @@ -276,7 +395,7 @@ FD_SECTORS_PER_TRACK := $(PERL) $(PROJECT_ROOT)/scripts/numsecs_per_track # ---------------------------------------------------------------------- # Flags used for all C source files -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) $(BOOT_FLAGS) -fPIC CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror # Flags used for kernel C source files @@ -336,6 +455,9 @@ devices/%.o : devices/%.c devices/%.o : devices/%.asm $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o +net/%.o : net/%.c + $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_USER_OPTS) $< -o net/$*.o + # ---------------------------------------------------------------------- # Targets - # Specifies files to be built @@ -366,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 @@ -408,7 +539,7 @@ geekos/setup.bin : geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/setup.asm -DVMM_SIZE=`$(NUMSECS) geekos/kernel.bin` \ $(PROJECT_ROOT)/src/geekos/setup.asm \ -o $@ - $(PAD) $@ 512 + $(PAD) $@ 2048 # Loadable (flat) kernel image. geekos/kernel.bin : geekos/kernel.exe @@ -416,10 +547,10 @@ geekos/kernel.bin : geekos/kernel.exe $(PAD) $@ 512 # The kernel executable and symbol map. -geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) vm_kernel +geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(TCPSTACK_OBJS) vm_kernel $(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \ $(DECODER_FLAGS) \ - $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) -b binary vm_kernel + $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) $(TCPSTACK_OBJS) -b binary vm_kernel $(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms @@ -435,7 +566,7 @@ force: # Clean build directories of generated files clean : - for d in geekos common libc user tools palacios devices; do \ + for d in geekos common libc user tools palacios devices net; do \ (cd $$d && rm -f *); \ done