2018-09-06 8:53 GMT+09:00 Rob Herring <robh@xxxxxxxxxx>: > There is nothing arch specific about building dtb files other than their > location under /arch/*/boot/dts/. Keeping each arch aligned is a pain. > The dependencies and supported targets are all slightly different. > Also, a cross-compiler for each arch is needed, but really the host > compiler preprocessor is perfectly fine for building dtbs. Move the > build rules to a common location and remove the arch specific ones. This > is done in a single step to avoid warnings about overriding rules. > > The build dependencies had been a mixture of 'scripts' and/or 'prepare'. > These pull in several dependencies some of which need a target compiler > (specifically devicetable-offsets.h) and aren't needed to build dtbs. > All that is really needed is dtc, so adjust the dependencies to only be > dtc. > > This change enables support 'dtbs_install' on some arches which were > missing the target. > > Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > Cc: Michal Marek <michal.lkml@xxxxxxxxxxx> > Cc: Vineet Gupta <vgupta@xxxxxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxx> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Will Deacon <will.deacon@xxxxxxx> > Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx> > Cc: Michal Simek <monstr@xxxxxxxxx> > Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> > Cc: Paul Burton <paul.burton@xxxxxxxx> > Cc: James Hogan <jhogan@xxxxxxxxxx> > Cc: Ley Foon Tan <lftan@xxxxxxxxxx> > Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> > Cc: Paul Mackerras <paulus@xxxxxxxxx> > Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > Cc: Chris Zankel <chris@xxxxxxxxxx> > Cc: Max Filippov <jcmvbkbc@xxxxxxxxx> > Cc: linux-kbuild@xxxxxxxxxxxxxxx > Cc: linux-snps-arc@xxxxxxxxxxxxxxxxxxx > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: uclinux-h8-devel@xxxxxxxxxxxxxxxxxxxx > Cc: linux-mips@xxxxxxxxxxxxxx > Cc: nios2-dev@xxxxxxxxxxxxxxxxxxxxxx > Cc: linuxppc-dev@xxxxxxxxxxxxxxxx > Cc: linux-xtensa@xxxxxxxxxxxxxxxx > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> > --- > Please ack so I can take the whole series via the DT tree. > > v2: > - Fix $arch/boot/dts path check for out of tree builds > - Fix dtc dependency for building built-in dtbs > - Fix microblaze built-in dtb building > > Makefile | 32 +++++++++++++++++++++++++++++++ > arch/arc/Makefile | 6 ------ > arch/arm/Makefile | 20 +------------------ > arch/arm64/Makefile | 17 +--------------- > arch/c6x/Makefile | 2 -- > arch/h8300/Makefile | 11 +---------- > arch/microblaze/Makefile | 4 +--- > arch/microblaze/boot/dts/Makefile | 2 ++ > arch/mips/Makefile | 15 +-------------- > arch/nds32/Makefile | 2 +- > arch/nios2/Makefile | 7 ------- > arch/nios2/boot/Makefile | 4 ---- > arch/powerpc/Makefile | 3 --- > arch/xtensa/Makefile | 12 +----------- > scripts/Makefile.lib | 2 +- > 15 files changed, 42 insertions(+), 97 deletions(-) > > diff --git a/Makefile b/Makefile > index 2b458801ba74..bc18dbbc16c5 100644 > --- a/Makefile > +++ b/Makefile > @@ -1212,6 +1212,32 @@ kselftest-merge: > $(srctree)/tools/testing/selftests/*/config > +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig > > +# --------------------------------------------------------------------------- > +# Devicetree files > + > +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/boot/dts/),) > +dtstree := arch/$(SRCARCH)/boot/dts > +endif > + > +ifdef CONFIG_OF_EARLY_FLATTREE > + > +%.dtb %.dtb.S %.dtb.o: | dtc > + $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ Hmm, I was worried about '%.dtb.o: | dtc' but seems working. Compiling %.S -> %.o requires objtool for x86, but x86 does not support DT. If CONFIG_MODVERSIONS=y, scripts/genksyms/genksyms is required, %.dtb.S does not contain EXPORT_SYMBOL. BTW, 'dtc' should be a PHONY target. -- Best Regards Masahiro Yamada
