diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-25 17:29:24 -0400 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2011-10-26 08:07:51 -0500 |
| commit | 8f459c5d72673e1a3a119ac58a7eee56236fca73 (patch) | |
| tree | 0b53793148427a44b6090f8102fda4a17dd7956e | |
| parent | 033089f29099bdfd5c2d6986cdb9fd07b16cfde0 (diff) | |
| download | dtc-8f459c5d72673e1a3a119ac58a7eee56236fca73.tar.gz | |
fdtdump: rename from ftdump
The freetype package already installs a binary named "ftdump", so the dtc
package conflicts with that. So rename the newer dtc tool to "fdtdump".
This even makes a bit more sense:
ftdump: [F]lat device [T]ree [dump]
fdtdump: [F]lat [D]evice [T]ree [dump]
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Documentation/manual.txt | 10 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.utils | 6 | ||||
| -rw-r--r-- | fdtdump.c (renamed from ftdump.c) | 2 |
5 files changed, 13 insertions, 13 deletions
@@ -7,6 +7,6 @@ lex.yy.c *.lex.c /dtc -/ftdump +/fdtdump /convert-dtsv0 /version_gen.h diff --git a/Documentation/manual.txt b/Documentation/manual.txt index f8a8a7b..14508f3 100644 --- a/Documentation/manual.txt +++ b/Documentation/manual.txt @@ -21,7 +21,7 @@ III - libfdt IV - Utility Tools 1) convert-dtsv0 -- Conversion to Version 1 - 1) ftdump + 1) fdtdump I - "dtc", the device tree compiler @@ -643,10 +643,10 @@ a new file with a "v1" appended the filename. Comments, empty lines, etc. are preserved. -2) ftdump -- Flat Tree dumping utility +2) fdtdump -- Flat Device Tree dumping utility -The ftdump program prints a readable version of a flat device tree file. +The fdtdump program prints a readable version of a flat device tree file. -The syntax of the ftdump command line is: +The syntax of the fdtdump command line is: - ftdump <DTB-file-name> + fdtdump <DTB-file-name> @@ -109,7 +109,7 @@ include Makefile.utils BIN += convert-dtsv0 BIN += dtc -BIN += ftdump +BIN += fdtdump SCRIPTS = dtdiff @@ -119,7 +119,7 @@ all: $(BIN) libfdt ifneq ($(DEPTARGETS),) -include $(DTC_OBJS:%.o=%.d) -include $(CONVERT_OBJS:%.o=%.d) --include $(FTDUMP_OBJS:%.o=%.d) +-include $(FDTDUMP_OBJS:%.o=%.d) endif @@ -178,7 +178,7 @@ convert-dtsv0: $(CONVERT_OBJS) @$(VECHO) LD $@ $(LINK.c) -o $@ $^ -ftdump: $(FTDUMP_OBJS) +fdtdump: $(FDTDUMP_OBJS) # diff --git a/Makefile.utils b/Makefile.utils index 0ed9297..fae5b00 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -3,8 +3,8 @@ # be easily embeddable into other systems of Makefiles. # -FTDUMP_SRCS = \ - ftdump.c \ +FDTDUMP_SRCS = \ + fdtdump.c \ util.c -FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o) +FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o) @@ -1,5 +1,5 @@ /* - * ftdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com> + * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com> */ #include <stdint.h> |