From: Peter Dinda Date: Mon, 11 Feb 2008 00:28:26 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: JACK-WORKING-STATIC-GEEKOS~9 X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=19963ec00c85aea5e9f3511101b7b3312708500d *** empty log message *** --- diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 7e9603a..87bc7df 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.5 $ +# $Revision: 1.6 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -139,8 +139,8 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o) #TARGET_CC_PREFIX := i386-elf- # Target C compiler. gcc 2.95.2 or later should work. -TARGET_CC := $(TARGET_CC_PREFIX)gcc -#TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32 +#TARGET_CC := $(TARGET_CC_PREFIX)gcc +TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32 # Host C compiler. This is used to compile programs to execute on # the host platform, not the target (x86) platform. On x86/ELF @@ -164,7 +164,8 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy # Nasm (http://nasm.sourceforge.net) -NASM := $(PROJECT_ROOT)/../devtools/bin/nasm +#NASM := $(PROJECT_ROOT)/../devtools/bin/nasm +NASM := /opt/vmm-tools/bin/nasm AS = as --32 diff --git a/palacios/include/geekos/vmm_sizes.h b/palacios/include/geekos/vmm_sizes.h index 335d9f9..5dbce4d 100644 --- a/palacios/include/geekos/vmm_sizes.h +++ b/palacios/include/geekos/vmm_sizes.h @@ -2,7 +2,7 @@ #define __vmm_sizes #define KERNEL_LOAD_ADDRESS 0x3fe9d000 #define KERNEL_START (KERNEL_LOAD_ADDRESS) -#define KERNEL_CORE_LENGTH ( 187 *512) +#define KERNEL_CORE_LENGTH ( 211 *512) #define KERNEL_END (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH-1) #define VM_KERNEL_LENGTH ( 1673 *512) #define VM_KERNEL_START (KERNEL_LOAD_ADDRESS + KERNEL_CORE_LENGTH)