From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule Date: Thu, 15 Nov 2012 10:15:25 +0000 Message-ID: References: <1351721431-26220-1-git-send-email-swarren@wwwdotorg.org> <20121102095801.GC17860@linux-mips.org> <20121102102335.GF2905@linux-mips.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <20121102102335.GF2905@linux-mips.org> Sender: linux-kernel-owner@vger.kernel.org To: Ralf Baechle Cc: Stephen Warren , Michal Marek , David Gibson , Jon Loeliger , Rob Herring , Scott Wood , Mark Brown , Jean-Christophe PLAGNIOL-VILLARD , Sam Ravnborg , linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arch@vger.kernel.org, Stephen Warren , linux-mips@linux-mips.org List-Id: linux-arch.vger.kernel.org On Fri, Nov 2, 2012 at 10:23 AM, Ralf Baechle 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 > > 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. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-da0-f46.google.com ([209.85.210.46]:39068 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423250Ab2KOKPq (ORCPT ); Thu, 15 Nov 2012 05:15:46 -0500 Received: by mail-da0-f46.google.com with SMTP id n41so608317dak.19 for ; Thu, 15 Nov 2012 02:15:46 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20121102102335.GF2905@linux-mips.org> References: <1351721431-26220-1-git-send-email-swarren@wwwdotorg.org> <20121102095801.GC17860@linux-mips.org> <20121102102335.GF2905@linux-mips.org> From: Grant Likely Date: Thu, 15 Nov 2012 10:15:25 +0000 Message-ID: Subject: Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ralf Baechle Cc: Stephen Warren , Michal Marek , David Gibson , Jon Loeliger , Rob Herring , Scott Wood , Mark Brown , Jean-Christophe PLAGNIOL-VILLARD , Sam Ravnborg , linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arch@vger.kernel.org, Stephen Warren , linux-mips@linux-mips.org Message-ID: <20121115101525.6KIivQ8qHuRw3yT_iSh4RDYdmKeRgWOF9yVoRhzR0zQ@z> On Fri, Nov 2, 2012 at 10:23 AM, Ralf Baechle 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 > > 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.