From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: Re: [PATCH 01/11] libfdt: move headers to xen/include/xen/libfdt/ Date: Mon, 19 Mar 2012 17:58:10 +0000 Message-ID: <4F6773B2.70601@citrix.com> References: <1332179529-1828-1-git-send-email-david.vrabel@citrix.com> <1332179529-1828-2-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1332179529-1828-2-git-send-email-david.vrabel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: David Vrabel Cc: "xen-devel@lists.xensource.com" , Ian Campbell List-Id: xen-devel@lists.xenproject.org On 19/03/12 17:51, David Vrabel wrote: > From: David Vrabel > > Move the public libfdt headers to xen/include/xen/libfdt/ so CFLAGS > does need to be set to find them. This requires minor tweaks to one > of the headers imported from upstream. > > Signed-off-by: David Vrabel Sorry, forgot the -M option when generating this. The real diff is much more modest. 8<-------------------- [PATCH] libfdt: move headers to xen/include/xen/libfdt/ Move the public libfdt headers to xen/include/xen/libfdt/ so CFLAGS does need to be set to find them. This requires minor tweaks to one of the headers imported from upstream. Signed-off-by: David Vrabel --- xen/common/Makefile | 2 -- xen/common/device_tree.c | 3 +-- xen/common/libfdt/Makefile | 2 +- xen/{common => include/xen}/libfdt/fdt.h | 0 xen/{common => include/xen}/libfdt/libfdt.h | 4 ++-- xen/{common => include/xen}/libfdt/libfdt_env.h | 0 6 files changed, 4 insertions(+), 7 deletions(-) rename xen/{common => include/xen}/libfdt/fdt.h (100%) rename xen/{common => include/xen}/libfdt/libfdt.h (99%) rename xen/{common => include/xen}/libfdt/libfdt_env.h (100%) diff --git a/xen/common/Makefile b/xen/common/Makefile index 372b259..9f2e0d6 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -61,5 +61,3 @@ subdir-$(ia64) += hvm subdir-y += libelf subdir-$(HAS_DEVICE_TREE) += libfdt - -CFLAGS += -Ilibfdt diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index d50cb9c..140d342 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -14,13 +14,12 @@ #include #include #include +#include #include #include #include #include -#include - struct dt_early_info __initdata early_info; void *device_tree_flattened; diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index 0e65bc0..7578fe9 100644 --- a/xen/common/libfdt/Makefile +++ b/xen/common/libfdt/Makefile @@ -2,4 +2,4 @@ include Makefile.libfdt obj-y += $(LIBFDT_OBJS) -CFLAGS += -I. +CFLAGS += -I$(BASEDIR)/include/xen/libfdt/ diff --git a/xen/common/libfdt/fdt.h b/xen/include/xen/libfdt/fdt.h similarity index 100% rename from xen/common/libfdt/fdt.h rename to xen/include/xen/libfdt/fdt.h diff --git a/xen/common/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h similarity index 99% rename from xen/common/libfdt/libfdt.h rename to xen/include/xen/libfdt/libfdt.h index 55f3eb3..6086047 100644 --- a/xen/common/libfdt/libfdt.h +++ b/xen/include/xen/libfdt/libfdt.h @@ -51,8 +51,8 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #define FDT_FIRST_SUPPORTED_VERSION 0x10 #define FDT_LAST_SUPPORTED_VERSION 0x11 diff --git a/xen/common/libfdt/libfdt_env.h b/xen/include/xen/libfdt/libfdt_env.h similarity index 100% rename from xen/common/libfdt/libfdt_env.h rename to xen/include/xen/libfdt/libfdt_env.h -- 1.7.2.5