diff mbox

[2/6] dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst

Message ID 1409899692-1455-3-git-send-email-rric@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Robert Richter Sept. 5, 2014, 6:48 a.m. UTC 
From: Robert Richter <rrichter@cavium.com>

Move dtbs install rules to Makefile.dtbinst. This change is needed to
implement support for dts vendor subdirs. The change makes Makefiles
easier and smaller as no longer the dtbs_install rule needs to be
defined. Another advantage is that install goals are not encoded in
targets anymore (%.dtb_dtbinst_).

Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 arch/arm/Makefile            |  6 +++++-
 arch/arm/boot/dts/Makefile   |  2 --
 arch/arm64/Makefile          |  6 +++++-
 arch/arm64/boot/dts/Makefile |  2 --
 scripts/Kbuild.include       |  6 ++++++
 scripts/Makefile.dtbinst     | 38 ++++++++++++++++++++++++++++++++++++++
 scripts/Makefile.lib         | 12 ------------
 7 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 scripts/Makefile.dtbinst

Comments

Rob Herring Sept. 5, 2014, 12:48 p.m. UTC | #1 
On Fri, Sep 5, 2014 at 1:48 AM, Robert Richter <rric@kernel.org> wrote:
> From: Robert Richter <rrichter@cavium.com>
>
> Move dtbs install rules to Makefile.dtbinst. This change is needed to
> implement support for dts vendor subdirs. The change makes Makefiles
> easier and smaller as no longer the dtbs_install rule needs to be
> defined. Another advantage is that install goals are not encoded in
> targets anymore (%.dtb_dtbinst_).
>
> Signed-off-by: Robert Richter <rrichter@cavium.com>
> ---
>  arch/arm/Makefile            |  6 +++++-
>  arch/arm/boot/dts/Makefile   |  2 --
>  arch/arm64/Makefile          |  6 +++++-
>  arch/arm64/boot/dts/Makefile |  2 --
>  scripts/Kbuild.include       |  6 ++++++
>  scripts/Makefile.dtbinst     | 38 ++++++++++++++++++++++++++++++++++++++
>  scripts/Makefile.lib         | 12 ------------
>  7 files changed, 54 insertions(+), 18 deletions(-)
>  create mode 100644 scripts/Makefile.dtbinst
>
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 0ce9d0f71f2a..1963d9a9a2c4 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -313,9 +313,13 @@ $(BOOT_TARGETS): vmlinux
>         $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
>
>  PHONY += dtbs dtbs_install
> -dtbs dtbs_install: prepare scripts
> +
> +dtbs: prepare scripts
>         $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
>
> +dtbs_install:
> +       $(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)

Can't you get rid of MACHINE here, too?

Rob

> +
>  # We use MRPROPER_FILES and CLEAN_FILES now
>  archclean:
>         $(Q)$(MAKE) $(clean)=$(boot)
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index b8c5cd3ddeb9..ab40afb87fb2 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -502,5 +502,3 @@ dtbs: $(addprefix $(obj)/, $(dtb-y))
>         $(Q)rm -f $(obj)/../*.dtb
>
>  clean-files := *.dtb
> -
> -dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
> diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
> index e0a8292bc832..1627861e9bbd 100644
> --- a/arch/arm64/Makefile
> +++ b/arch/arm64/Makefile
> @@ -72,9 +72,13 @@ zinstall install: vmlinux
>         $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
>
>  PHONY += dtbs dtbs_install
> -dtbs dtbs_install: prepare scripts
> +
> +dtbs: prepare scripts
>         $(Q)$(MAKE) $(build)=$(boot)/dts $@
>
> +dtbs_install:
> +       $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
> +
>  PHONY += vdso_install
>  vdso_install:
>         $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
> diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
> index 82e1c4cf8780..0a14c3828301 100644
> --- a/arch/arm64/boot/dts/Makefile
> +++ b/arch/arm64/boot/dts/Makefile
> @@ -7,5 +7,3 @@ targets += $(dtb-y)
>  dtbs: $(addprefix $(obj)/, $(dtb-y))
>
>  clean-files := *.dtb
> -
> -dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
> diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
> index 8a9a4e1c7eab..861f5b4d48a2 100644
> --- a/scripts/Kbuild.include
> +++ b/scripts/Kbuild.include
> @@ -179,6 +179,12 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
>  # $(Q)$(MAKE) $(modbuiltin)=dir
>  modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj
>
> +###
> +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
> +# Usage:
> +# $(Q)$(MAKE) $(dtbinst)=dir
> +dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
> +
>  # Prefix -I with $(srctree) if it is not an absolute path.
>  # skip if -I has no parameter
>  addtree = $(if $(patsubst -I%,%,$(1)), \
> diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
> new file mode 100644
> index 000000000000..54286cccc289
> --- /dev/null
> +++ b/scripts/Makefile.dtbinst
> @@ -0,0 +1,38 @@
> +# ==========================================================================
> +# Installing dtb files
> +#
> +# Installs all dtb files listed in $(dtb-y) either in the
> +# INSTALL_DTBS_PATH directory or the default location:
> +#
> +#   $INSTALL_PATH/dtbs/$KERNELRELEASE
> +#
> +# ==========================================================================
> +
> +src := $(obj)
> +
> +PHONY := __dtbs_install
> +__dtbs_install:
> +
> +include include/config/auto.conf
> +include scripts/Kbuild.include
> +include $(srctree)/$(obj)/Makefile
> +
> +PHONY += __dtbs_install_prep
> +__dtbs_install_prep:
> +       $(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi
> +       $(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi
> +       $(Q)mkdir -p $(INSTALL_DTBS_PATH)
> +
> +dtbinst-files  := $(dtb-y)
> +
> +# Helper targets for Installing DTBs into the boot directory
> +quiet_cmd_dtb_install =        INSTALL $<
> +      cmd_dtb_install =        cp $< $(2)
> +
> +$(dtbinst-files): %.dtb: $(obj)/%.dtb | __dtbs_install_prep
> +       $(call cmd,dtb_install,$(INSTALL_DTBS_PATH))
> +
> +PHONY += $(dtbinst-files)
> +__dtbs_install: $(dtbinst-files)
> +
> +.PHONY: $(PHONY)
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 260bf8acfce9..83a453794266 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -274,18 +274,6 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
>
>  dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
>
> -# Helper targets for Installing DTBs into the boot directory
> -quiet_cmd_dtb_install =        INSTALL $<
> -      cmd_dtb_install =        cp $< $(2)
> -
> -_dtbinst_pre_:
> -       $(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi
> -       $(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi
> -       $(Q)mkdir -p $(INSTALL_DTBS_PATH)
> -
> -%.dtb_dtbinst_: $(obj)/%.dtb _dtbinst_pre_
> -       $(call cmd,dtb_install,$(INSTALL_DTBS_PATH))
> -
>  # Bzip2
>  # ---------------------------------------------------------------------------
>
> --
> 2.0.1
>
Robert Richter Sept. 8, 2014, 7:14 a.m. UTC | #2 
On 05.09.14 07:48:30, Rob Herring wrote:
> On Fri, Sep 5, 2014 at 1:48 AM, Robert Richter <rric@kernel.org> wrote:
> > From: Robert Richter <rrichter@cavium.com>
> >
> > Move dtbs install rules to Makefile.dtbinst. This change is needed to
> > implement support for dts vendor subdirs. The change makes Makefiles
> > easier and smaller as no longer the dtbs_install rule needs to be
> > defined. Another advantage is that install goals are not encoded in
> > targets anymore (%.dtb_dtbinst_).
> >
> > Signed-off-by: Robert Richter <rrichter@cavium.com>
> > ---
> >  arch/arm/Makefile            |  6 +++++-
> >  arch/arm/boot/dts/Makefile   |  2 --
> >  arch/arm64/Makefile          |  6 +++++-
> >  arch/arm64/boot/dts/Makefile |  2 --
> >  scripts/Kbuild.include       |  6 ++++++
> >  scripts/Makefile.dtbinst     | 38 ++++++++++++++++++++++++++++++++++++++
> >  scripts/Makefile.lib         | 12 ------------
> >  7 files changed, 54 insertions(+), 18 deletions(-)
> >  create mode 100644 scripts/Makefile.dtbinst
> >
> > diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> > index 0ce9d0f71f2a..1963d9a9a2c4 100644
> > --- a/arch/arm/Makefile
> > +++ b/arch/arm/Makefile
> > @@ -313,9 +313,13 @@ $(BOOT_TARGETS): vmlinux
> >         $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
> >
> >  PHONY += dtbs dtbs_install
> > -dtbs dtbs_install: prepare scripts
> > +
> > +dtbs: prepare scripts
> >         $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
> >
> > +dtbs_install:
> > +       $(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)
> 
> Can't you get rid of MACHINE here, too?

I moved this change to the end of this patch series to let maintainers
the choise to drop the change if they are not fine with it.

-Robert
diff mbox

Patch

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0ce9d0f71f2a..1963d9a9a2c4 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -313,9 +313,13 @@  $(BOOT_TARGETS): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
-dtbs dtbs_install: prepare scripts
+
+dtbs: prepare scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
 
+dtbs_install:
+	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)
+
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b8c5cd3ddeb9..ab40afb87fb2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -502,5 +502,3 @@  dtbs: $(addprefix $(obj)/, $(dtb-y))
 	$(Q)rm -f $(obj)/../*.dtb
 
 clean-files := *.dtb
-
-dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index e0a8292bc832..1627861e9bbd 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -72,9 +72,13 @@  zinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
-dtbs dtbs_install: prepare scripts
+
+dtbs: prepare scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts $@
 
+dtbs_install:
+	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts
+
 PHONY += vdso_install
 vdso_install:
 	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 82e1c4cf8780..0a14c3828301 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -7,5 +7,3 @@  targets += $(dtb-y)
 dtbs: $(addprefix $(obj)/, $(dtb-y))
 
 clean-files := *.dtb
-
-dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 8a9a4e1c7eab..861f5b4d48a2 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -179,6 +179,12 @@  build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 # $(Q)$(MAKE) $(modbuiltin)=dir
 modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj
 
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
+# Usage:
+# $(Q)$(MAKE) $(dtbinst)=dir
+dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
+
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
new file mode 100644
index 000000000000..54286cccc289
--- /dev/null
+++ b/scripts/Makefile.dtbinst
@@ -0,0 +1,38 @@ 
+# ==========================================================================
+# Installing dtb files
+#
+# Installs all dtb files listed in $(dtb-y) either in the
+# INSTALL_DTBS_PATH directory or the default location:
+#
+#   $INSTALL_PATH/dtbs/$KERNELRELEASE
+#
+# ==========================================================================
+
+src := $(obj)
+
+PHONY := __dtbs_install
+__dtbs_install:
+
+include include/config/auto.conf
+include scripts/Kbuild.include
+include $(srctree)/$(obj)/Makefile
+
+PHONY += __dtbs_install_prep
+__dtbs_install_prep:
+	$(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi
+	$(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi
+	$(Q)mkdir -p $(INSTALL_DTBS_PATH)
+
+dtbinst-files	:= $(dtb-y)
+
+# Helper targets for Installing DTBs into the boot directory
+quiet_cmd_dtb_install =	INSTALL $<
+      cmd_dtb_install =	cp $< $(2)
+
+$(dtbinst-files): %.dtb: $(obj)/%.dtb | __dtbs_install_prep
+	$(call cmd,dtb_install,$(INSTALL_DTBS_PATH))
+
+PHONY += $(dtbinst-files)
+__dtbs_install: $(dtbinst-files)
+
+.PHONY: $(PHONY)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 260bf8acfce9..83a453794266 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -274,18 +274,6 @@  $(obj)/%.dtb: $(src)/%.dts FORCE
 
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 
-# Helper targets for Installing DTBs into the boot directory
-quiet_cmd_dtb_install =	INSTALL $<
-      cmd_dtb_install =	cp $< $(2)
-
-_dtbinst_pre_:
-	$(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi
-	$(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi
-	$(Q)mkdir -p $(INSTALL_DTBS_PATH)
-
-%.dtb_dtbinst_: $(obj)/%.dtb _dtbinst_pre_
-	$(call cmd,dtb_install,$(INSTALL_DTBS_PATH))
-
 # Bzip2
 # ---------------------------------------------------------------------------