* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule [not found] <1351721431-26220-1-git-send-email-swarren@wwwdotorg.org> @ 2012-11-02 9:58 ` Ralf Baechle 2012-11-02 10:23 ` Ralf Baechle 0 siblings, 1 reply; 11+ messages in thread From: Ralf Baechle @ 2012-11-02 9:58 UTC (permalink / raw) To: Stephen Warren Cc: Michal Marek, David Gibson, Jon Loeliger, Grant Likely, Rob Herring, Scott Wood, Mark Brown, Jean-Christophe PLAGNIOL-VILLARD, Sam Ravnborg, linux-kernel, devicetree-discuss, linux-arch, Stephen Warren, linux-mips On Wed, Oct 31, 2012 at 04:10:30PM -0600, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > All architectures that use cmd_dtc do so in the same way. Move the build > rule to a central location to avoid duplication. Can you fold these MIPS bits into your patch? Ralf Signed-off-by: Ralf Baechle <ralf@linux-mips.org> arch/mips/cavium-octeon/Makefile | 3 --- arch/mips/netlogic/dts/Makefile | 3 --- 2 files changed, 6 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/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) ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-02 9:58 ` [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule Ralf Baechle @ 2012-11-02 10:23 ` Ralf Baechle 2012-11-02 15:00 ` Stephen Warren 2012-11-15 10:15 ` Grant Likely 0 siblings, 2 replies; 11+ messages in thread From: Ralf Baechle @ 2012-11-02 10:23 UTC (permalink / raw) To: Stephen Warren Cc: Michal Marek, David Gibson, Jon Loeliger, Grant Likely, Rob Herring, Scott Wood, Mark Brown, Jean-Christophe PLAGNIOL-VILLARD, Sam Ravnborg, linux-kernel, devicetree-discuss, linux-arch, Stephen Warren, linux-mips 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@linux-mips.org> 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) ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-02 10:23 ` Ralf Baechle @ 2012-11-02 15:00 ` Stephen Warren 2012-11-15 10:15 ` Grant Likely 1 sibling, 0 replies; 11+ messages in thread From: Stephen Warren @ 2012-11-02 15:00 UTC (permalink / raw) To: Ralf Baechle Cc: Michal Marek, David Gibson, Jon Loeliger, Grant Likely, Rob Herring, Scott Wood, Mark Brown, Jean-Christophe PLAGNIOL-VILLARD, Sam Ravnborg, linux-kernel, devicetree-discuss, linux-arch, Stephen Warren, linux-mips On 11/02/2012 04: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. Thanks, I've squashed that in, and with a quick grep noticed that arch/{arm64,microblaze} also need updating. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-02 10:23 ` Ralf Baechle 2012-11-02 15:00 ` Stephen Warren @ 2012-11-15 10:15 ` Grant Likely 2012-11-15 10:32 ` Grant Likely 1 sibling, 1 reply; 11+ messages in thread From: Grant Likely @ 2012-11-15 10:15 UTC (permalink / raw) 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, devicetree-discuss, linux-arch, Stephen Warren, linux-mips On Fri, Nov 2, 2012 at 10:23 AM, Ralf Baechle <ralf@linux-mips.org> 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@linux-mips.org> > > 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. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 10:15 ` Grant Likely @ 2012-11-15 10:32 ` Grant Likely 2012-11-15 11:51 ` Grant Likely 0 siblings, 1 reply; 11+ messages in thread From: Grant Likely @ 2012-11-15 10:32 UTC (permalink / raw) 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, devicetree-discuss, linux-arch, Stephen Warren, linux-mips On Thu, Nov 15, 2012 at 10:15 AM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Fri, Nov 2, 2012 at 10:23 AM, Ralf Baechle <ralf@linux-mips.org> 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@linux-mips.org> >> >> 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. On second thought. I'm dropping this patch entirely for now. I don't want to put in a generic rule that expects files in weird locations. If we can fix up all the architectures to build dtb in the dts directory, then it is better for each architecture to have a separate fixup patch instead of changing everyone at once. Or how about: I could pick up the patch with only the MIPS hunk and every other user can be fixed up independently to use the new rule. g. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 10:32 ` Grant Likely @ 2012-11-15 11:51 ` Grant Likely 2012-11-15 11:51 ` Grant Likely 2012-11-15 18:09 ` Stephen Warren 0 siblings, 2 replies; 11+ messages in thread From: Grant Likely @ 2012-11-15 11:51 UTC (permalink / raw) Cc: linux-kernel, devicetree-discuss, linux-arch, linux-mips, Grant Likely, Stephen Warren, Sam Ravnborg Grant Likely wrote: > Or how about: I could pick up the patch with only the MIPS hunk and > every other user can be fixed up independently to use the new rule. Here's a trial patch to fix up ARM. Does this look correct? This patch depends on the generic dtb build rule already being applied. g. --- arm/of: Change .dtb build rules to build in dts directory The current rules have the .dtb files build in a different directory from the .dts files. The only reason for this is that it was what PowerPC has done historically. This patch changes ARM to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Stephen Warren <swarren@nvidia.com> Cc: Sam Ravnborg <sam@ravnborg.org> --- arch/arm/Makefile | 4 ++-- arch/arm/boot/Makefile | 12 ------------ arch/arm/boot/dts/Makefile | 4 ++++ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5f914fc..c35baf1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -292,10 +292,10 @@ zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs # We use MRPROPER_FILES and CLEAN_FILES now archclean: diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index f2aa09e..801b92c 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -15,8 +15,6 @@ ifneq ($(MACHINE),) include $(srctree)/$(MACHINE)/Makefile.boot endif -include $(srctree)/arch/arm/boot/dts/Makefile - # Note: the following conditions must always be true: # ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET) # PARAMS_PHYS must be within 4MB of ZRELADDR @@ -59,16 +57,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE endif -targets += $(dtb-y) - -# Rule to build device tree blobs -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) - -clean-files := *.dtb - ifneq ($(LOADADDR),) UIMAGE_LOADADDR=$(LOADADDR) else diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9f..2aef042 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -104,4 +104,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ wm8505-ref.dtb \ wm8650-mid.dtb +targets += dtbs endif + +dtbs: $(addprefix $(obj)/, $(dtb-y)) +clean-files := *.dtb -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 11:51 ` Grant Likely @ 2012-11-15 11:51 ` Grant Likely 2012-11-15 18:09 ` Stephen Warren 1 sibling, 0 replies; 11+ messages in thread From: Grant Likely @ 2012-11-15 11:51 UTC (permalink / raw) Cc: linux-kernel, devicetree-discuss, linux-arch, linux-mips, Grant Likely, Stephen Warren, Sam Ravnborg Grant Likely wrote: > Or how about: I could pick up the patch with only the MIPS hunk and > every other user can be fixed up independently to use the new rule. Here's a trial patch to fix up ARM. Does this look correct? This patch depends on the generic dtb build rule already being applied. g. --- arm/of: Change .dtb build rules to build in dts directory The current rules have the .dtb files build in a different directory from the .dts files. The only reason for this is that it was what PowerPC has done historically. This patch changes ARM to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Stephen Warren <swarren@nvidia.com> Cc: Sam Ravnborg <sam@ravnborg.org> --- arch/arm/Makefile | 4 ++-- arch/arm/boot/Makefile | 12 ------------ arch/arm/boot/dts/Makefile | 4 ++++ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5f914fc..c35baf1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -292,10 +292,10 @@ zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs # We use MRPROPER_FILES and CLEAN_FILES now archclean: diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index f2aa09e..801b92c 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -15,8 +15,6 @@ ifneq ($(MACHINE),) include $(srctree)/$(MACHINE)/Makefile.boot endif -include $(srctree)/arch/arm/boot/dts/Makefile - # Note: the following conditions must always be true: # ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET) # PARAMS_PHYS must be within 4MB of ZRELADDR @@ -59,16 +57,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE endif -targets += $(dtb-y) - -# Rule to build device tree blobs -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) - -clean-files := *.dtb - ifneq ($(LOADADDR),) UIMAGE_LOADADDR=$(LOADADDR) else diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9f..2aef042 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -104,4 +104,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ wm8505-ref.dtb \ wm8650-mid.dtb +targets += dtbs endif + +dtbs: $(addprefix $(obj)/, $(dtb-y)) +clean-files := *.dtb -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 11:51 ` Grant Likely 2012-11-15 11:51 ` Grant Likely @ 2012-11-15 18:09 ` Stephen Warren 2012-11-15 18:20 ` Grant Likely 1 sibling, 1 reply; 11+ messages in thread From: Stephen Warren @ 2012-11-15 18:09 UTC (permalink / raw) To: Grant Likely Cc: linux-arch, linux-mips, Stephen Warren, devicetree-discuss, linux-kernel, Sam Ravnborg On 11/15/2012 04:51 AM, Grant Likely wrote: > Grant Likely wrote: >> Or how about: I could pick up the patch with only the MIPS hunk and >> every other user can be fixed up independently to use the new rule. > > Here's a trial patch to fix up ARM. Does this look correct? This patch > depends on the generic dtb build rule already being applied. I think the patch looks OK technically, except for one minor comment below. One issue with this patch is that it moves *.dts from arch/arm/boot to arch/arm/boot/dts, which means everyone has to adjust their scripts/... that package/install/... the kernel. I guess it's an easy change for people to make, but could easily catch people unawares if they do incremental builds so that arch/arm/boot/*.dtb still exists but is stale. > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index f37cf9f..2aef042 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -104,4 +104,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ > wm8505-ref.dtb \ > wm8650-mid.dtb > > +targets += dtbs Doesn't that make the "dtbs" target always run by default? Perhaps that's reasonable though, and doesn't actually affect anything since the make command for this directory always specifies an explicit target? Or, was that meant to be the following that got removed from ../Makefile? targets += $(dtb-y) > endif > + > +dtbs: $(addprefix $(obj)/, $(dtb-y)) > +clean-files := *.dtb ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 18:09 ` Stephen Warren @ 2012-11-15 18:20 ` Grant Likely 2012-11-15 18:31 ` Stephen Warren 0 siblings, 1 reply; 11+ messages in thread From: Grant Likely @ 2012-11-15 18:20 UTC (permalink / raw) To: Stephen Warren Cc: linux-arch, linux-mips, Stephen Warren, devicetree-discuss, linux-kernel, Sam Ravnborg On Thu, Nov 15, 2012 at 6:09 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 11/15/2012 04:51 AM, Grant Likely wrote: >> Grant Likely wrote: >>> Or how about: I could pick up the patch with only the MIPS hunk and >>> every other user can be fixed up independently to use the new rule. >> >> Here's a trial patch to fix up ARM. Does this look correct? This patch >> depends on the generic dtb build rule already being applied. > > I think the patch looks OK technically, except for one minor comment below. > > One issue with this patch is that it moves *.dts from arch/arm/boot to > arch/arm/boot/dts, which means everyone has to adjust their scripts/... > that package/install/... the kernel. I guess it's an easy change for > people to make, but could easily catch people unawares if they do > incremental builds so that arch/arm/boot/*.dtb still exists but is stale. True. We could temporarily remove or rename if the same file exists in the directory below to help people catch that problem. I really would like to clean up that build rule to be consistent though. The other option is to move all the .dts files into the boot directory, but I don't think that is a good idea at all. >> +targets += dtbs > > Doesn't that make the "dtbs" target always run by default? Perhaps > that's reasonable though, and doesn't actually affect anything since the > make command for this directory always specifies an explicit target? > > Or, was that meant to be the following that got removed from ../Makefile? > > targets += $(dtb-y) Yes it is supposed to be the same thing. Doesn't it effectively do the same since dtbs depends on $(dtb-y)? g. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 18:20 ` Grant Likely @ 2012-11-15 18:31 ` Stephen Warren 2012-11-20 22:00 ` Grant Likely 0 siblings, 1 reply; 11+ messages in thread From: Stephen Warren @ 2012-11-15 18:31 UTC (permalink / raw) To: Grant Likely Cc: linux-arch, linux-mips, Stephen Warren, devicetree-discuss, linux-kernel, Sam Ravnborg On 11/15/2012 11:20 AM, Grant Likely wrote: > On Thu, Nov 15, 2012 at 6:09 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: >> On 11/15/2012 04:51 AM, Grant Likely wrote: >>> Grant Likely wrote: >>>> Or how about: I could pick up the patch with only the MIPS hunk and >>>> every other user can be fixed up independently to use the new rule. >>> >>> Here's a trial patch to fix up ARM. Does this look correct? This patch >>> depends on the generic dtb build rule already being applied. >> >> I think the patch looks OK technically, except for one minor comment below. >> >> One issue with this patch is that it moves *.dts from arch/arm/boot to >> arch/arm/boot/dts, which means everyone has to adjust their scripts/... >> that package/install/... the kernel. I guess it's an easy change for >> people to make, but could easily catch people unawares if they do >> incremental builds so that arch/arm/boot/*.dtb still exists but is stale. > > True. We could temporarily remove or rename if the same file exists in > the directory below to help people catch that problem. I really would > like to clean up that build rule to be consistent though. > > The other option is to move all the .dts files into the boot > directory, but I don't think that is a good idea at all. Maybe we can just add "rm *.dtb" to the following rules in boot/Makefile, before calling the child make? %.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs >>> +targets += dtbs >> >> Doesn't that make the "dtbs" target always run by default? Perhaps >> that's reasonable though, and doesn't actually affect anything since the >> make command for this directory always specifies an explicit target? >> >> Or, was that meant to be the following that got removed from ../Makefile? >> >> targets += $(dtb-y) > > Yes it is supposed to be the same thing. Doesn't it effectively do the > same since dtbs depends on $(dtb-y)? Ah, I think so yes. I guess anyway that $(targets) is presumably ignored if an explicit build target is requested from make. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule 2012-11-15 18:31 ` Stephen Warren @ 2012-11-20 22:00 ` Grant Likely 0 siblings, 0 replies; 11+ messages in thread From: Grant Likely @ 2012-11-20 22:00 UTC (permalink / raw) To: Stephen Warren Cc: linux-arch, linux-mips, Stephen Warren, devicetree-discuss, linux-kernel, Sam Ravnborg On Thu, 15 Nov 2012 11:31:38 -0700, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 11/15/2012 11:20 AM, Grant Likely wrote: > > On Thu, Nov 15, 2012 at 6:09 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > >> On 11/15/2012 04:51 AM, Grant Likely wrote: > >>> Grant Likely wrote: > >>>> Or how about: I could pick up the patch with only the MIPS hunk and > >>>> every other user can be fixed up independently to use the new rule. > >>> > >>> Here's a trial patch to fix up ARM. Does this look correct? This patch > >>> depends on the generic dtb build rule already being applied. > >> > >> I think the patch looks OK technically, except for one minor comment below. > >> > >> One issue with this patch is that it moves *.dts from arch/arm/boot to > >> arch/arm/boot/dts, which means everyone has to adjust their scripts/... > >> that package/install/... the kernel. I guess it's an easy change for > >> people to make, but could easily catch people unawares if they do > >> incremental builds so that arch/arm/boot/*.dtb still exists but is stale. > > > > True. We could temporarily remove or rename if the same file exists in > > the directory below to help people catch that problem. I really would > > like to clean up that build rule to be consistent though. > > > > The other option is to move all the .dts files into the boot > > directory, but I don't think that is a good idea at all. > > Maybe we can just add "rm *.dtb" to the following rules in > boot/Makefile, before calling the child make? > > %.dtb: scripts > - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ > + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ > > dtbs: scripts > - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ > + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs > > >>> +targets += dtbs > >> > >> Doesn't that make the "dtbs" target always run by default? Perhaps > >> that's reasonable though, and doesn't actually affect anything since the > >> make command for this directory always specifies an explicit target? > >> > >> Or, was that meant to be the following that got removed from ../Makefile? > >> > >> targets += $(dtb-y) > > > > Yes it is supposed to be the same thing. Doesn't it effectively do the > > same since dtbs depends on $(dtb-y)? > > Ah, I think so yes. > > I guess anyway that $(targets) is presumably ignored if an explicit > build target is requested from make. Can you pull into your series and get it working. The merge window is going to open this week, so I have to push it back to v3.9 anyway. g. -- Grant Likely, B.Sc, P.Eng. Secret Lab Technologies, Ltd. ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-11-20 22:00 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1351721431-26220-1-git-send-email-swarren@wwwdotorg.org>
2012-11-02 9:58 ` [PATCH V5 1/2] kbuild: centralize .dts->.dtb rule Ralf Baechle
2012-11-02 10:23 ` Ralf Baechle
2012-11-02 15:00 ` Stephen Warren
2012-11-15 10:15 ` Grant Likely
2012-11-15 10:32 ` Grant Likely
2012-11-15 11:51 ` Grant Likely
2012-11-15 11:51 ` Grant Likely
2012-11-15 18:09 ` Stephen Warren
2012-11-15 18:20 ` Grant Likely
2012-11-15 18:31 ` Stephen Warren
2012-11-20 22:00 ` Grant Likely
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox