diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-28 12:03:02 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-28 12:03:02 +0000 |
| commit | b816828e04f69dc53b887c2238694249cca0b53d (patch) | |
| tree | a78836d7fca27e7c89a54083bab51ee4cfff0fbe /tools/firmware | |
| parent | 79902f7c4f7595d9587e916fdf78a06c198a5c55 (diff) | |
| download | xen-b816828e04f69dc53b887c2238694249cca0b53d.tar.gz xen-b816828e04f69dc53b887c2238694249cca0b53d.tar.bz2 xen-b816828e04f69dc53b887c2238694249cca0b53d.zip | |
firmware: Use new path to xen public headers.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/firmware')
| -rw-r--r-- | tools/firmware/hvmloader/Makefile | 3 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/acpi/Makefile | 3 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/util.c | 1 | ||||
| -rw-r--r-- | tools/firmware/vmxassist/Makefile | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 7e5127f423..2234005221 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -20,7 +20,7 @@ override XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. -CFLAGS := -I$(XEN_ROOT)/tools/libxc -I. +CFLAGS := include $(XEN_ROOT)/tools/Rules.mk # The HVM loader is started in 32-bit mode at the address below: @@ -32,6 +32,7 @@ CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) CFLAGS += -fno-builtin -O2 -msoft-float +CFLAGS += $(CFLAGS_include) -I. SRCS = hvmloader.c mp_tables.c util.c smbios.c 32bitbios_support.c OBJS = $(patsubst %.c,%.o,$(SRCS)) diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile index 07981efffb..79a49541ce 100644 --- a/tools/firmware/hvmloader/acpi/Makefile +++ b/tools/firmware/hvmloader/acpi/Makefile @@ -17,7 +17,7 @@ override XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../../.. -CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc +CFLAGS := include $(XEN_ROOT)/tools/Rules.mk C_SRC = build.c dsdt.c static_tables.c @@ -33,6 +33,7 @@ CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) CFLAGS += -fno-builtin -O2 -msoft-float +CFLAGS += -I. -I.. $(CFLAGS_include) vpath iasl $(PATH) all: acpi.a diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 790cffa38f..cb3fd754e7 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -22,7 +22,6 @@ #include "config.h" #include "e820.h" #include <stdint.h> -#include <xenctrl.h> #include <xen/hvm/hvm_info_table.h> void outb(uint16_t addr, uint8_t val) diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index b00224ae8a..503f9cea82 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -23,13 +23,13 @@ CFLAGS := override XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. -include $(XEN_ROOT)/Config.mk +include $(XEN_ROOT)/tools/Rules.mk # The emulator code lives in ROM space TEXTADDR=0x000D0000 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR) -XENINC=-I$(XEN_ROOT)/tools/libxc +XENINC=$(CFLAGS_include) # Disable PIE/SSP if GCC supports them. They can break us. CFLAGS += $(call cc-option,$(CC),-nopie,) |