From d68cb36b0bebc7711ada9b750f3c19398c44efb7 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 8 Dec 2009 14:24:42 +1100 Subject: dtc: Simpler interface to source file management This patch cleans up our handling of input files, particularly dts source files, but also (to an extent) other input files such as those used by /incbin/ and those used in -I dtb and -I fs modes. We eliminate the current clunky mechanism which combines search paths (which we don't actually use at present) with the open relative to current source file behaviour, which we do. Instead there's a single srcfile_relative_open() entry point for callers which opens a new input file relative to the current source file (which the srcpos code tracks internally). It doesn't currently do search paths, but we can add that later without messing with the callers, by drawing the search path from a global (which makes sense anyway, rather than shuffling it around the rest of the processing code). That suffices for non-dts input files. For the actual dts files, srcfile_push() and srcfile_pop() wrappers open the file while also keeping track of it as the current source file for future opens. Signed-off-by: David Gibson --- util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'util.h') diff --git a/util.h b/util.h index 0fb60fe..9cead84 100644 --- a/util.h +++ b/util.h @@ -51,5 +51,6 @@ static inline void *xrealloc(void *p, size_t len) } extern char *xstrdup(const char *s); +extern char *join_path(const char *path, const char *name); #endif /* _UTIL_H */ -- cgit v1.2.1