| Message ID | 20210729140527.443116-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: move the (z)install rules to arch/arm64/Makefile | expand |
On Thu, Jul 29, 2021 at 11:05:27PM +0900, Masahiro Yamada wrote: > Currently, the (z)install targets in arch/arm64/Makefile descend into > arch/arm64/boot/Makefile to invoke the shell script, but there is no > good reason to do so. > > arch/arm64/Makefile can run the shell script directly. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/arm64/Makefile | 7 +++++-- > arch/arm64/boot/Makefile | 8 -------- > 2 files changed, 5 insertions(+), 10 deletions(-) Is this part of some cross-arch clean-up? I can see x86 for example does the same thing. Thanks.
On Mon, Aug 2, 2021 at 9:46 PM Catalin Marinas <catalin.marinas@arm.com> wrote: > > On Thu, Jul 29, 2021 at 11:05:27PM +0900, Masahiro Yamada wrote: > > Currently, the (z)install targets in arch/arm64/Makefile descend into > > arch/arm64/boot/Makefile to invoke the shell script, but there is no > > good reason to do so. > > > > arch/arm64/Makefile can run the shell script directly. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > arch/arm64/Makefile | 7 +++++-- > > arch/arm64/boot/Makefile | 8 -------- > > 2 files changed, 5 insertions(+), 10 deletions(-) > > Is this part of some cross-arch clean-up? I can see x86 for example does > the same thing. > > Thanks. > Yes. I want to do these cleanups tree-wide, but I sent patches per arch. Please pick it up to your arm64 tree if you do not mind.
On Tue, Aug 03, 2021 at 02:40:44PM +0900, Masahiro Yamada wrote: > On Mon, Aug 2, 2021 at 9:46 PM Catalin Marinas <catalin.marinas@arm.com> wrote: > > > > On Thu, Jul 29, 2021 at 11:05:27PM +0900, Masahiro Yamada wrote: > > > Currently, the (z)install targets in arch/arm64/Makefile descend into > > > arch/arm64/boot/Makefile to invoke the shell script, but there is no > > > good reason to do so. > > > > > > arch/arm64/Makefile can run the shell script directly. > > > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > > --- > > > > > > arch/arm64/Makefile | 7 +++++-- > > > arch/arm64/boot/Makefile | 8 -------- > > > 2 files changed, 5 insertions(+), 10 deletions(-) > > > > Is this part of some cross-arch clean-up? I can see x86 for example does > > the same thing. > > > > Thanks. > > > > Yes. I want to do these cleanups tree-wide, but > I sent patches per arch. > > Please pick it up to your arm64 tree > if you do not mind. Just to confirm -- this would be for 5.15, right? Will
On Tue, Aug 3, 2021 at 6:06 PM Will Deacon <will@kernel.org> wrote: > > On Tue, Aug 03, 2021 at 02:40:44PM +0900, Masahiro Yamada wrote: > > On Mon, Aug 2, 2021 at 9:46 PM Catalin Marinas <catalin.marinas@arm.com> wrote: > > > > > > On Thu, Jul 29, 2021 at 11:05:27PM +0900, Masahiro Yamada wrote: > > > > Currently, the (z)install targets in arch/arm64/Makefile descend into > > > > arch/arm64/boot/Makefile to invoke the shell script, but there is no > > > > good reason to do so. > > > > > > > > arch/arm64/Makefile can run the shell script directly. > > > > > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > > > --- > > > > > > > > arch/arm64/Makefile | 7 +++++-- > > > > arch/arm64/boot/Makefile | 8 -------- > > > > 2 files changed, 5 insertions(+), 10 deletions(-) > > > > > > Is this part of some cross-arch clean-up? I can see x86 for example does > > > the same thing. > > > > > > Thanks. > > > > > > > Yes. I want to do these cleanups tree-wide, but > > I sent patches per arch. > > > > Please pick it up to your arm64 tree > > if you do not mind. > > Just to confirm -- this would be for 5.15, right? > > Will Right. This is not a bug fix, but a clean-up. So, we can queue it for the next MW.
On Thu, 29 Jul 2021 23:05:27 +0900, Masahiro Yamada wrote: > Currently, the (z)install targets in arch/arm64/Makefile descend into > arch/arm64/boot/Makefile to invoke the shell script, but there is no > good reason to do so. > > arch/arm64/Makefile can run the shell script directly. Applied to arm64 (for-next/misc), thanks! [1/1] arm64: move the (z)install rules to arch/arm64/Makefile https://git.kernel.org/arm64/c/70a4039bd4d7
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 7bc37d0a1b68..ded13230f901 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -165,8 +165,11 @@ Image: vmlinux Image.%: Image $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -zinstall install: - $(Q)$(MAKE) $(build)=$(boot) $@ +install: install-image := Image +zinstall: install-image := Image.gz +install zinstall: + $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \ + $(boot)/$(install-image) System.map "$(INSTALL_PATH)" PHONY += vdso_install vdso_install: diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index cd3414898d10..ebe80faab883 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -35,11 +35,3 @@ $(obj)/Image.lzma: $(obj)/Image FORCE $(obj)/Image.lzo: $(obj)/Image FORCE $(call if_changed,lzo) - -install: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ - $(obj)/Image System.map "$(INSTALL_PATH)" - -zinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ - $(obj)/Image.gz System.map "$(INSTALL_PATH)"
Currently, the (z)install targets in arch/arm64/Makefile descend into arch/arm64/boot/Makefile to invoke the shell script, but there is no good reason to do so. arch/arm64/Makefile can run the shell script directly. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/arm64/Makefile | 7 +++++-- arch/arm64/boot/Makefile | 8 -------- 2 files changed, 5 insertions(+), 10 deletions(-)