X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=0d31d7ef4ebff2d3109cced83168c6e3c0875ca6;hb=7246e098eaeb10934569dd4c6ef12753a1637351;hp=6e9a71c1858a9576ad1a81cab4be7873de0f2ec0;hpb=a81cc0e300f0a1c25bb28747785461695e99ab6a;p=palacios.releases.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 6e9a71c..0d31d7e 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 <daveho@cs.umd.edu>
-# $Revision: 1.59 $
+# $Revision: 1.65 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -49,7 +49,7 @@ 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
@@ -81,6 +81,9 @@ endif
 ifeq ($(DEBUG_EMULATOR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_EMULATOR
 endif
+ifeq ($(DEBUG_RAMDISK),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
+endif
 
 
 ifeq ($(DEBUG),1)
@@ -114,6 +117,16 @@ endif
 #
 TCPSTACK=UIP
 
+#
+#RAMDISK
+#
+RAMDISK_SRCS=
+BOOT_FLAGS=
+
+ifeq ($(RAMDISK_BOOT),1)
+BOOT_FLAGS := $(BOOT_FLAGS) -DRAMDISK_BOOT
+RAMDISK_SRCS := ramdisk.c cdrom.c
+endif
 
 
 
@@ -203,7 +216,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
 
@@ -214,7 +227,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)
 
@@ -297,7 +310,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
@@ -432,7 +445,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
@@ -443,7 +456,7 @@ geekos/kernel.bin : geekos/kernel.exe
 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
 
 
@@ -459,7 +472,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