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.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dtc.c') diff --git a/dtc.c b/dtc.c index 92a338f..76a6dfe 100644 --- a/dtc.c +++ b/dtc.c @@ -92,7 +92,7 @@ static void __attribute__ ((noreturn)) usage(void) fprintf(stderr, "\t\t\tdtb - device tree blob\n"); fprintf(stderr, "\t\t\tasm - assembler source\n"); fprintf(stderr, "\t-V \n"); - fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", OF_DEFAULT_VERSION); + fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION); fprintf(stderr, "\t-R \n"); fprintf(stderr, "\t\tMake space for reserve map entries (relevant for \n\t\tdtb and asm output only)\n"); fprintf(stderr, "\t-S \n"); @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) int opt; FILE *inf = NULL; FILE *outf = NULL; - int outversion = OF_DEFAULT_VERSION; + int outversion = DEFAULT_FDT_VERSION; int boot_cpuid_phys = 0xfeedbeef; quiet = 0; -- cgit v1.1