diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2012-03-22 14:26:42 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2012-03-22 14:26:42 +0000 |
| commit | 48ad5e9e21853e164e20fdc7f01c5da18cb62676 (patch) | |
| tree | dbc7af73ea586bc255626318f0b151603002fda8 /xen | |
| parent | 066cfcad02459f6b08f07639e0176c62f4c5b5ca (diff) | |
| download | xen-48ad5e9e21853e164e20fdc7f01c5da18cb62676.tar.gz xen-48ad5e9e21853e164e20fdc7f01c5da18cb62676.tar.bz2 xen-48ad5e9e21853e164e20fdc7f01c5da18cb62676.zip | |
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 <david.vrabel@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/common/Makefile | 2 | ||||
| -rw-r--r-- | xen/common/device_tree.c | 3 | ||||
| -rw-r--r-- | xen/common/libfdt/Makefile | 2 | ||||
| -rw-r--r-- | xen/include/xen/libfdt/fdt.h (renamed from xen/common/libfdt/fdt.h) | 0 | ||||
| -rw-r--r-- | xen/include/xen/libfdt/libfdt.h (renamed from xen/common/libfdt/libfdt.h) | 4 | ||||
| -rw-r--r-- | xen/include/xen/libfdt/libfdt_env.h (renamed from xen/common/libfdt/libfdt_env.h) | 0 |
6 files changed, 4 insertions, 7 deletions
diff --git a/xen/common/Makefile b/xen/common/Makefile index 372b259a11..9f2e0d612e 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 d50cb9cc6b..140d34297a 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -14,13 +14,12 @@ #include <xen/device_tree.h> #include <xen/kernel.h> #include <xen/lib.h> +#include <xen/libfdt/libfdt.h> #include <xen/mm.h> #include <xen/stdarg.h> #include <xen/string.h> #include <asm/early_printk.h> -#include <libfdt.h> - struct dt_early_info __initdata early_info; void *device_tree_flattened; diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index 0e65bc06b8..7578fe9c50 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 index 48ccfd9100..48ccfd9100 100644 --- a/xen/common/libfdt/fdt.h +++ b/xen/include/xen/libfdt/fdt.h diff --git a/xen/common/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h index 55f3eb3042..608604738c 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 <libfdt_env.h> -#include <fdt.h> +#include <xen/libfdt/libfdt_env.h> +#include <xen/libfdt/fdt.h> #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 index 8c0c03034b..8c0c03034b 100644 --- a/xen/common/libfdt/libfdt_env.h +++ b/xen/include/xen/libfdt/libfdt_env.h |