[Xen-changelog] [xen-unstable] firmware: Use new path to xen public headers.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201521782 0
# Node ID 4a92c68db1d2864688e3b02fb099930c08210ce4
# Parent  ed2ca78286a8c30ab68e37c7eccae6d1748f0d50
firmware: Use new path to xen public headers.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/firmware/hvmloader/Makefile      |    3 ++-
 tools/firmware/hvmloader/acpi/Makefile |    3 ++-
 tools/firmware/hvmloader/util.c        |    1 -
 tools/firmware/vmxassist/Makefile      |    4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff -r ed2ca78286a8 -r 4a92c68db1d2 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Mon Jan 28 11:28:55 2008 +0000
+++ b/tools/firmware/hvmloader/Makefile Mon Jan 28 12:03:02 2008 +0000
@@ -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-s
 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 -r ed2ca78286a8 -r 4a92c68db1d2 tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile    Mon Jan 28 11:28:55 2008 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile    Mon Jan 28 12:03:02 2008 +0000
@@ -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-s
 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 -r ed2ca78286a8 -r 4a92c68db1d2 tools/firmware/hvmloader/util.c
--- a/tools/firmware/hvmloader/util.c   Mon Jan 28 11:28:55 2008 +0000
+++ b/tools/firmware/hvmloader/util.c   Mon Jan 28 12:03:02 2008 +0000
@@ -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 -r ed2ca78286a8 -r 4a92c68db1d2 tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Mon Jan 28 11:28:55 2008 +0000
+++ b/tools/firmware/vmxassist/Makefile Mon Jan 28 12:03:02 2008 +0000
@@ -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,)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog