On Fri, Nov 2, 2012 at 10:23 AM, Ralf Baechle <ralf@xxxxxxxxxxxxxx> wrote: > On Fri, Nov 02, 2012 at 10:58:01AM +0100, Ralf Baechle wrote: > >> Can you fold these MIPS bits into your patch? > > I missed Lantiq. > > Ralf > > Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> > > arch/mips/cavium-octeon/Makefile | 3 --- > arch/mips/lantiq/dts/Makefile | 3 --- > arch/mips/netlogic/dts/Makefile | 3 --- > 3 files changed, 9 deletions(-) > > diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile > index bc96e29..6e927cf 100644 > --- a/arch/mips/cavium-octeon/Makefile > +++ b/arch/mips/cavium-octeon/Makefile > @@ -24,9 +24,6 @@ DTB_FILES = $(patsubst %.dts, %.dtb, $(DTS_FILES)) > > obj-y += $(patsubst %.dts, %.dtb.o, $(DTS_FILES)) > > -$(obj)/%.dtb: $(src)/%.dts FORCE > - $(call if_changed_dep,dtc) > - > # Let's keep the .dtb files around in case we want to look at them. > .SECONDARY: $(addprefix $(obj)/, $(DTB_FILES)) > > diff --git a/arch/mips/lantiq/dts/Makefile b/arch/mips/lantiq/dts/Makefile > index 674fca4..6fa72dd 100644 > --- a/arch/mips/lantiq/dts/Makefile > +++ b/arch/mips/lantiq/dts/Makefile > @@ -1,4 +1 @@ > obj-$(CONFIG_DT_EASY50712) := easy50712.dtb.o > - > -$(obj)/%.dtb: $(obj)/%.dts > - $(call if_changed,dtc) > diff --git a/arch/mips/netlogic/dts/Makefile b/arch/mips/netlogic/dts/Makefile > index 67ae3fe2..d117d46 100644 > --- a/arch/mips/netlogic/dts/Makefile > +++ b/arch/mips/netlogic/dts/Makefile > @@ -1,4 +1 @@ > obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o > - > -$(obj)/%.dtb: $(obj)/%.dts > - $(call if_changed,dtc) This actually breaks MIPS builds. MIPS builds the .dtbs in the same directory as the .dts files. Everyone else has a dts/ subdirectory, which is admittedly a bit insane, but until things are resolved I've dropped the above MIPS hunks. MIPS /could/ be changed to also use a dts directory, but I'd actually rather if someone could make all the other platforms build the dtbs in the same directory. I've looked at it briefly, but I haven't figured out all the make magic needed to do it nicely. g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
