ia64/xen-unstable

changeset 14198:afed0aeff629

Fix PAE Mini-OS build.
Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>
author kfraser@localhost.localdomain
date Thu Mar 01 12:23:04 2007 +0000 (2007-03-01)
parents 0de2f7d8d89f
children bdebca505d8e
files extras/mini-os/Makefile extras/mini-os/arch/x86/Makefile extras/mini-os/arch/x86/arch.mk
line diff
     1.1 --- a/extras/mini-os/Makefile	Thu Mar 01 12:14:53 2007 +0000
     1.2 +++ b/extras/mini-os/Makefile	Thu Mar 01 12:23:04 2007 +0000
     1.3 @@ -4,8 +4,6 @@
     1.4  # Makefile and a arch.mk.
     1.5  #
     1.6  
     1.7 -pae ?= n
     1.8 -
     1.9  XEN_ROOT = ../..
    1.10  include $(XEN_ROOT)/Config.mk
    1.11  
    1.12 @@ -35,6 +33,7 @@ TARGET_ARCH_DIR := arch/$(TARGET_ARCH_FA
    1.13  export TARGET_ARCH
    1.14  export TARGET_ARCH_DIR
    1.15  export TARGET_ARCH_FAM
    1.16 +export XEN_TARGET_X86_PAE 
    1.17  
    1.18  # This is used for architecture specific links.
    1.19  # This can be overwritten from arch specific rules.
     2.1 --- a/extras/mini-os/arch/x86/Makefile	Thu Mar 01 12:14:53 2007 +0000
     2.2 +++ b/extras/mini-os/arch/x86/Makefile	Thu Mar 01 12:23:04 2007 +0000
     2.3 @@ -4,6 +4,7 @@
     2.4  #
     2.5  
     2.6  # include arch.mk has to be before mini-os.mk!
     2.7 +
     2.8  include arch.mk
     2.9  include ../../minios.mk
    2.10  
     3.1 --- a/extras/mini-os/arch/x86/arch.mk	Thu Mar 01 12:14:53 2007 +0000
     3.2 +++ b/extras/mini-os/arch/x86/arch.mk	Thu Mar 01 12:23:04 2007 +0000
     3.3 @@ -9,13 +9,11 @@ ARCH_LDFLAGS := -m elf_i386
     3.4  ARCH_ASFLAGS := -m32
     3.5  EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
     3.6  EXTRA_SRC += arch/$(EXTRA_INC)
     3.7 +
     3.8 +ifeq ($(XEN_TARGET_X86_PAE),y)
     3.9 +ARCH_CFLAGS  += -DCONFIG_X86_PAE=1
    3.10 +ARCH_ASFLAGS += -DCONFIG_X86_PAE=1
    3.11  endif
    3.12 -
    3.13 -ifeq ($(TARGET_ARCH)$(pae),x86_32y)
    3.14 -ARCH_CFLAGS  := -DCONFIG_X86_PAE=1
    3.15 -ARCH_ASFLAGS := -DCONFIG_X86_PAE=1
    3.16 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
    3.17 -EXTRA_SRC += arch/$(EXTRA_INC)
    3.18  endif
    3.19  
    3.20  ifeq ($(TARGET_ARCH),x86_64)