firmware: Use new path to xen public headers.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 7e5127f423d2a859f8b9a3e08ad162fb207aaca2..22340052216d8295f7863d1062bf769af6af10b5 100644 (file)
--- 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 07981efffbe8f96e86dad97967289b2e52bf5efa..79a49541cea427a7dfd8e629fed723390f5358c3 100644 (file)
--- 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 790cffa38f4013e1853df691493abb1af6dfeac0..cb3fd754e7f8b0233b3f582dd00117f935725e02 100644 (file)
--- 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 b00224ae8a9b0c30874e2c1c56b648cce4390604..503f9cea8217e137f67ef6c09239ac07e607dccc 100644 (file)
--- 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,)