diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-03-01 12:23:04 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-03-01 12:23:04 +0000 |
| commit | 84e23d3ec9d8396dda23452caa84c21e9f0305f8 (patch) | |
| tree | 41c8ae0d88440e41a81ec675704b4221579225d8 /extras/mini-os | |
| parent | 167b02743b6cd4d7e5a880f28f451a23d0a753cc (diff) | |
| download | xen-84e23d3ec9d8396dda23452caa84c21e9f0305f8.tar.gz xen-84e23d3ec9d8396dda23452caa84c21e9f0305f8.tar.bz2 xen-84e23d3ec9d8396dda23452caa84c21e9f0305f8.zip | |
Fix PAE Mini-OS build.
Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>
Diffstat (limited to 'extras/mini-os')
| -rw-r--r-- | extras/mini-os/Makefile | 3 | ||||
| -rw-r--r-- | extras/mini-os/arch/x86/Makefile | 1 | ||||
| -rw-r--r-- | extras/mini-os/arch/x86/arch.mk | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index e337f1656d..75427676e5 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -4,8 +4,6 @@ # Makefile and a arch.mk. # -pae ?= n - XEN_ROOT = ../.. include $(XEN_ROOT)/Config.mk @@ -35,6 +33,7 @@ TARGET_ARCH_DIR := arch/$(TARGET_ARCH_FAM) export TARGET_ARCH export TARGET_ARCH_DIR export TARGET_ARCH_FAM +export XEN_TARGET_X86_PAE # This is used for architecture specific links. # This can be overwritten from arch specific rules. diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 8e655f1d64..10cb1ff9a1 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -4,6 +4,7 @@ # # include arch.mk has to be before mini-os.mk! + include arch.mk include ../../minios.mk diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os/arch/x86/arch.mk index 9a7704b490..bf3350c150 100644 --- a/extras/mini-os/arch/x86/arch.mk +++ b/extras/mini-os/arch/x86/arch.mk @@ -9,13 +9,11 @@ ARCH_LDFLAGS := -m elf_i386 ARCH_ASFLAGS := -m32 EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) -endif -ifeq ($(TARGET_ARCH)$(pae),x86_32y) -ARCH_CFLAGS := -DCONFIG_X86_PAE=1 -ARCH_ASFLAGS := -DCONFIG_X86_PAE=1 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH) -EXTRA_SRC += arch/$(EXTRA_INC) +ifeq ($(XEN_TARGET_X86_PAE),y) +ARCH_CFLAGS += -DCONFIG_X86_PAE=1 +ARCH_ASFLAGS += -DCONFIG_X86_PAE=1 +endif endif ifeq ($(TARGET_ARCH),x86_64) |