LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
@ 2021-07-29 14:05 Masahiro Yamada
2021-08-02 12:46 ` Catalin Marinas
2021-08-03 15:47 ` Catalin Marinas
0 siblings, 2 replies; 6+ messages in thread
From: Masahiro Yamada @ 2021-07-29 14:05 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Masahiro Yamada, Catalin Marinas, Will Deacon, linux-kernel
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(-)
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)"
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
2021-07-29 14:05 [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile Masahiro Yamada
@ 2021-08-02 12:46 ` Catalin Marinas
2021-08-03 5:40 ` Masahiro Yamada
2021-08-03 15:47 ` Catalin Marinas
1 sibling, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2021-08-02 12:46 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-arm-kernel, Will Deacon, linux-kernel
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.
--
Catalin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
2021-08-02 12:46 ` Catalin Marinas
@ 2021-08-03 5:40 ` Masahiro Yamada
2021-08-03 9:06 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Masahiro Yamada @ 2021-08-03 5:40 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-arm-kernel, Will Deacon, Linux Kernel Mailing List
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.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
2021-08-03 5:40 ` Masahiro Yamada
@ 2021-08-03 9:06 ` Will Deacon
2021-08-03 11:35 ` Masahiro Yamada
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2021-08-03 9:06 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Catalin Marinas, linux-arm-kernel, Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
2021-08-03 9:06 ` Will Deacon
@ 2021-08-03 11:35 ` Masahiro Yamada
0 siblings, 0 replies; 6+ messages in thread
From: Masahiro Yamada @ 2021-08-03 11:35 UTC (permalink / raw)
To: Will Deacon; +Cc: Catalin Marinas, linux-arm-kernel, Linux Kernel Mailing List
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.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile
2021-07-29 14:05 [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile Masahiro Yamada
2021-08-02 12:46 ` Catalin Marinas
@ 2021-08-03 15:47 ` Catalin Marinas
1 sibling, 0 replies; 6+ messages in thread
From: Catalin Marinas @ 2021-08-03 15:47 UTC (permalink / raw)
To: Masahiro Yamada, linux-arm-kernel; +Cc: Will Deacon, linux-kernel
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
--
Catalin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-03 15:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 14:05 [PATCH] arm64: move the (z)install rules to arch/arm64/Makefile Masahiro Yamada
2021-08-02 12:46 ` Catalin Marinas
2021-08-03 5:40 ` Masahiro Yamada
2021-08-03 9:06 ` Will Deacon
2021-08-03 11:35 ` Masahiro Yamada
2021-08-03 15:47 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).