From fb7c7acf5a4187ea810043ae17854625a313b725 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 26 Sep 2007 13:11:05 +1000 Subject: dtc: Use libfdt/fdt.h instead of flat_dt.h In the dtc tree, both flat_dt.h and libfdt/fdt.h have structures and constants relating to the flattened device tree format derived from asm-powerpc/prom.h in the kernel. The former is used in dtc, the latter in libfdt. libfdt/fdt.h is the more recent, revised version, so use that throughout, removing flat_dt.h. Signed-off-by: David Gibson --- dtc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dtc.h') diff --git a/dtc.h b/dtc.h index 213e553..09dec54 100644 --- a/dtc.h +++ b/dtc.h @@ -34,8 +34,9 @@ #include #include -#include "flat_dt.h" +#include +#define DEFAULT_FDT_VERSION 17 /* * Command line options */ @@ -128,7 +129,7 @@ struct data data_copy_file(FILE *f, size_t len); struct data data_append_data(struct data d, void *p, int len); struct data data_merge(struct data d1, struct data d2); struct data data_append_cell(struct data d, cell_t word); -struct data data_append_re(struct data d, struct reserve_entry *re); +struct data data_append_re(struct data d, struct fdt_reserve_entry *re); struct data data_append_addr(struct data d, u64 addr); struct data data_append_byte(struct data d, uint8_t byte); struct data data_append_zeroes(struct data d, int len); @@ -192,7 +193,7 @@ int check_device_tree(struct node *dt, int outversion, int boot_cpuid_phys); /* Boot info (tree plus memreserve information */ struct reserve_info { - struct reserve_entry re; + struct fdt_reserve_entry re; struct reserve_info *next; -- cgit v1.1