Skip to contentSkip to conversation

arm64: move the (z)install rules to arch/arm64/Makefile

PATCH Applied Masahiro Yamada 3 participants 6 messages Jul 29, 2021 – Aug 3, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: move the (z)install rules to arch/arm64/Makefile

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.

---

 arch/arm64/Makefile      | 7 +++++--
 arch/arm64/boot/Makefile | 8 --------
 2 files changed, 5 insertions(+), 10 deletions(-)
arch/arm64/Makefile +5 -2
index 7bc37d0a1b68..ded13230f901 100644
@@ -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:
arch/arm64/boot/Makefile +0 -8
index cd3414898d10..ebe80faab883 100644
@@ -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)"
Signature · 7 lines
2.27.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#1 lore raw
Quoted 4 lines · Masahiro Yamada

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.

Quoted 8 lines

arch/arm64/Makefile can run the shell script directly.

---

 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.

Signature · 1 line
Catalin
#2 lore raw
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Masahiro Yamada

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.

---

Quoted 9 lines
Quoted 3 lines
 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.

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#3 lore raw
Quoted 19 lines · Masahiro Yamada
Quoted 18 lines · Catalin Marinas
Quoted 4 lines · Masahiro Yamada

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.

Quoted 8 lines

arch/arm64/Makefile can run the shell script directly.

---

 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.

Quoted 8 lines
Quoted 2 lines

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

#4 lore raw
Quoted 27 lines · Will Deacon
Quoted 25 lines · Masahiro Yamada
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Masahiro Yamada

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.

---

Quoted 9 lines
Quoted 3 lines
 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.

Quoted 6 lines
Quoted 2 lines

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.

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer Applied
#5 lore raw
In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

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
Signature · 1 line
Catalin