X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=c7449272ed61ac57479856173ffc468695848a8f;hb=9133e0d7fb8d5c662b4b588f32edddf553f82dca;hp=5e6f18d31737709dc86d888e52ef755d6313814c;hpb=dd37e2c1fabd6d6856c7a2cdbd2f3f73fb034393;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 5e6f18d..c744927 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.53 $ +# $Revision: 1.66 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -49,31 +49,95 @@ 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 @@ -103,6 +167,23 @@ else # This is an error endif +# +#TCPSTACK, uIP is used currently +# +TCPSTACK=UIP + +# +#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 +219,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 \ @@ -188,9 +269,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 \ + 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) @@ -200,7 +282,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) @@ -209,6 +291,14 @@ 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) + + + # ---------------------------------------------------------------------- # Tools - @@ -275,7 +365,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 @@ -335,6 +425,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_VMM_OPTS) $(CC_USER_OPTS) $< -o net/$*.o + # ---------------------------------------------------------------------- # Targets - # Specifies files to be built @@ -407,7 +500,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 @@ -415,10 +508,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 @@ -434,7 +527,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