| Message ID | 55bef0830d336fc1df24e4cbf96822acc70c8f7e.1384809305.git.jason@lakedaemon.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/18/2013 02:21 PM, Jason Cooper wrote: > In order for 'make dtbs_install' to be maintainable, we need a reliable > way to determine the board compatible string for a given dtb. fdtget > does that easily as written, but currently isn't built by the kernel. > diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile > +include $(src)/libfdt/Makefile.libfdt > + > +fdtget-objs := fdtget.o util.o $(patsubst %, libfdt/%, $(LIBFDT_OBJS)) I observe that there's a scripts/dtc/Makefile.dtc that /isn't/ used by scripts/dtc/Makefile. Hence, having scripts/dtc/Makefile use scripts/dtc/libfdt/Makefile.libfdt seems slightly inconsistent. That said, it's probably a good idea to use Makefile.libfdt, so perhaps the answer here is to update Makefile to use Makefile.dtc sometime, rather than not use Makefile.libfdt in this patch? Otherwise, this patch seems to make sense.
On Mon, 18 Nov 2013 15:54:26 -0700, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 11/18/2013 02:21 PM, Jason Cooper wrote: > > In order for 'make dtbs_install' to be maintainable, we need a reliable > > way to determine the board compatible string for a given dtb. fdtget > > does that easily as written, but currently isn't built by the kernel. > > > diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile > > > +include $(src)/libfdt/Makefile.libfdt > > + > > +fdtget-objs := fdtget.o util.o $(patsubst %, libfdt/%, $(LIBFDT_OBJS)) > > I observe that there's a scripts/dtc/Makefile.dtc that /isn't/ used by > scripts/dtc/Makefile. Hence, having scripts/dtc/Makefile use > scripts/dtc/libfdt/Makefile.libfdt seems slightly inconsistent. That > said, it's probably a good idea to use Makefile.libfdt, so perhaps the > answer here is to update Makefile to use Makefile.dtc sometime, rather > than not use Makefile.libfdt in this patch? Perhaps. I'll leave that to another patch is someone wants to take it on. I'm not overly worried though. Applied, thanks. g.
diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore index 095acb49a374..80f6b50fdf77 100644 --- a/scripts/dtc/.gitignore +++ b/scripts/dtc/.gitignore @@ -2,4 +2,4 @@ dtc dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h - +fdtget diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 2a48022c41e7..021522cb76f2 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -1,12 +1,16 @@ # scripts/dtc makefile -hostprogs-y := dtc +hostprogs-y := dtc fdtget always := $(hostprogs-y) dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \ srcpos.o checks.o util.o dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o +include $(src)/libfdt/Makefile.libfdt + +fdtget-objs := fdtget.o util.o $(patsubst %, libfdt/%, $(LIBFDT_OBJS)) + # Source files need to get at the userspace version of libfdt_env.h to compile HOSTCFLAGS_DTC := -I$(src) -I$(src)/libfdt @@ -14,6 +18,7 @@ HOSTCFLAGS_DTC := -I$(src) -I$(src)/libfdt HOSTCFLAGS_checks.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_data.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_dtc.o := $(HOSTCFLAGS_DTC) +HOSTCFLAGS_fdtget.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_flattree.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_fstree.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_livetree.o := $(HOSTCFLAGS_DTC) @@ -21,6 +26,9 @@ HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_util.o := $(HOSTCFLAGS_DTC) +$(foreach file, $(LIBFDT_OBJS), \ + $(eval HOSTCFLAGS_$(file) = -I$(src)/libfdt)) + HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC) HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC)
In order for 'make dtbs_install' to be maintainable, we need a reliable way to determine the board compatible string for a given dtb. fdtget does that easily as written, but currently isn't built by the kernel. Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- changes since v2: - switch from modifying dtc to building fdtget changes since v1: - made patch against in-tree dtc code to facilitate testing - dtc prints compatible string to stdout now, instead of creating symlink - should be more flexible for end-users scripts/dtc/.gitignore | 2 +- scripts/dtc/Makefile | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)