X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=e7cb6e324c6ed2ed30e423a5f7171ba492165abc;hb=b8f6183dad926e051fb7dd10835cff2318993b17;hp=ebd751b41de4ee71cc38d21b23699bbae6b8a4c2;hpb=bb102eef875adf3e667e4e3ffe7e6412b167b14e;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index ebd751b..e7cb6e3 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -1,46 +1,8 @@ -# 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.71 $ - - -# This is free software. You are permitted to use, -# redistribute, and modify it as specified in the file "COPYING". - -# Required software to build GeekOS: -# - GNU Make (http://www.gnu.org/software/make) -# - gcc 2.95.2 generating code for target (i386/ELF) and host platforms -# - Perl5, AWK (any version), egrep -# -# Cygwin (http://cygwin.com) may be used to build GeekOS. -# Make sure that gcc, binutils, nasm, and perl are installed. - -# NOTES: -# - This makefile has been written carefully to work correctly -# with the -j (parallel make) option. I regularly use "make -j 2" -# to speed the build process on 2 processor systems. - - -# Base address of kernel -# -# Note: at top of memory minus three pages (GDT/TSS/IDT) -# minus maximum size -# -# -# Note that the code will initially load at 0x10000 -# -# The setup code needs to copy it up to this address and jump there -# - - - PROJECT_ROOT := .. VPATH := $(PROJECT_ROOT)/src @@ -62,7 +24,7 @@ endif ifeq ($(DEBUG_ALL),1) - DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR + DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR # -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_IDE endif @@ -73,6 +35,14 @@ else ifeq ($(DEBUG_SHADOW_PAGING),0) DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING endif + +endif +ifeq ($(DEBUG_NESTED_PAGING),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NESTED_PAGING +else +ifeq ($(DEBUG_NESTED_PAGING),0) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NESTED_PAGING +endif endif ifeq ($(DEBUG_CTRL_REGS),1) @@ -195,7 +165,6 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_DEV_MGR endif endif -#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K ifeq ($(DEBUG),1) JRLDEBUG= -DVMM_DEBUG -DVMM_INFO -DVMM_TRACE $(DEBUG_SECTIONS) @@ -204,27 +173,6 @@ else endif - - - - -# -# 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 - - - ifeq ($(INSTRUMENT_VMM),1) EXTRA_C_OPTS:= -DINSTRUMENT_VMM INSTRUMENT_OPT := -finstrument-functions @@ -233,21 +181,15 @@ else INSTRUMENT_OPT := endif +CFLAGS = -fno-stack-protector -# ---------------------------------------------------------------------- -# Configuration - -# Various options specifying how GeekOS should be built, -# what source files to build, which user programs to build, -# etc. This is generally the only section of the makefile -# that will need to be modified. -# ---------------------------------------------------------------------- +# Compile targets -# List of targets to build by default. -# These targets encompass everything needed to boot -# and run GeekOS. ALL_TARGETS := vmm force_payload +# Compilation Objects + VMM_OBJS := \ palacios/vm_guest.o \ @@ -263,6 +205,7 @@ VMM_OBJS := \ palacios/vmm_debug.o \ palacios/svm_io.o \ palacios/vmm_intr.o \ + palacios/vmm_excp.o \ palacios/vmm_time.o \ palacios/vmm_shadow_paging.o \ palacios/vm_guest_mem.o \ @@ -294,7 +237,7 @@ VMM_OBJS := \ # Extra C flags for the VMM objects $(VMM_OBJS) :: EXTRA_CFLAGS = \ - $(JRLDEBUG) \ + $(JRLDEBUG) $(CFLAGS)\ @@ -303,7 +246,7 @@ XED_OBJS := \ xed/v3-udiv-compat.o \ $(XED_OBJS) :: EXTRA_CFLAGS = \ - $(JRLDEBUG) \ + $(JRLDEBUG) $(CFLAGS)\ DEVICES_OBJS := \ devices/generic.o \ @@ -321,14 +264,16 @@ DEVICES_OBJS := \ devices/pci.o \ devices/para_net.o \ devices/ide.o \ + devices/ram_cd.o \ + devices/ram_hd.o \ + devices/i440fx.o \ + devices/piix3.o \ - -# devices/cdrom.o \ -# devices/ramdisk.o \ +# devices/ne2k.o \ # devices/vnic.o \ $(DEVICES_OBJS) :: EXTRA_CFLAGS = \ - $(JRLDEBUG) \ + $(JRLDEBUG) $(CFLAGS)\ @@ -353,13 +298,11 @@ endif #TARGET_CC_PREFIX := $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf- #TARGET_CC_PREFIX := i386-elf- -# Target C compiler. gcc 2.95.2 or later should work. ifeq ($(ARCH),64) TARGET_CC := $(TARGET_CC_PREFIX)gcc -m64 else TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32 endif -#TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32 # Target linker. GNU ld is probably to only one that will work. @@ -377,10 +320,6 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm # Target objcopy TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy -# Nasm (http://nasm.sourceforge.net) -NASM := $(PROJECT_ROOT)/../devtools/bin/nasm -#NASM := /opt/vmm-tools/bin/nasm - CPP := cpp @@ -501,20 +440,6 @@ AS_COMPILE = \ # Default target - see definition of ALL_TARGETS in Configuration section all : $(ALL_TARGETS) - -#geekos/vmx_lowlevel.o: $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm -# $(NASM) -O99 \ -# -f elf \ -# -I$(PROJECT_ROOT)/src/geekos/ \ -# $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm \ -# -o $@ - - -#geekos/test: geekos/test.o geekos/vmcs.o geekos/vmx_lowlevel.o -# $(CC) geekos/test.o geekos/vmcs.o geekos/vmx_lowlevel.o -o geekos/test - - - rombios_link: ln -s -f ../src/vmboot/rombios/BIOS-bochs-latest rombios @@ -522,13 +447,7 @@ vgabios_link: ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios -force_rombios: rombios_link - (cd ../src/vmboot/rombios; make clean; make) - -force_vgabios: vgabios_link - (cd ../src/vmboot/vgabios; make clean; make) - -force_payload: force_rombios force_vgabios +force_payload: rombios_link vgabios_link ../scripts/make_payload.pl payload_layout.txt vm_kernel inter1: force_payload @@ -539,8 +458,6 @@ world: inter1 vmm vmm: palacios/vmm.lib - - # Loadable (flat) kernel image. palacios/vmm.bin : palacios/vmm.lib $(TARGET_OBJCOPY) $(OBJCOPY_FLAGS) -S -O binary palacios/vmm.lib palacios/vmm.bin