diff mbox series

[4/5] arch: decompressor: remove useless vmlinux.bin.all-y

Message ID 20220109181529.351420-4-masahiroy@kernel.org (mailing list archive)
State New, archived
Headers show
Series [1/5] sh: rename suffix-y to suffix_y | expand

Commit Message

Masahiro Yamada Jan. 9, 2022, 6:15 p.m. UTC
Presumably, arch/{parisc,s390,sh}/boot/compressed/Makefile copied
arch/x86/boot/compressed/Makefile, but vmlinux.bin.all-y is useless
here because it is the same as $(obj)/vmlinux.bin.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/parisc/boot/compressed/Makefile | 14 ++++++--------
 arch/s390/boot/compressed/Makefile   | 16 +++++++---------
 arch/sh/boot/compressed/Makefile     | 12 +++++-------
 3 files changed, 18 insertions(+), 24 deletions(-)

Comments

Nicolas Schier Jan. 10, 2022, 11:33 a.m. UTC | #1
On Mon, Jan 10, 2022 at 03:15:28AM +0900, Masahiro Yamada wrote:
> Presumably, arch/{parisc,s390,sh}/boot/compressed/Makefile copied
> arch/x86/boot/compressed/Makefile, but vmlinux.bin.all-y is useless
> here because it is the same as $(obj)/vmlinux.bin.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Reviewed-by: Nicolas Schier <n.schier@avm.de>

> 
>  arch/parisc/boot/compressed/Makefile | 14 ++++++--------
>  arch/s390/boot/compressed/Makefile   | 16 +++++++---------
>  arch/sh/boot/compressed/Makefile     | 12 +++++-------
>  3 files changed, 18 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile
> index 2640f72d69ce..877a7099b5e1 100644
> --- a/arch/parisc/boot/compressed/Makefile
> +++ b/arch/parisc/boot/compressed/Makefile
> @@ -58,8 +58,6 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -R .note -S
>  $(obj)/vmlinux.bin: vmlinux FORCE
>  	$(call if_changed,objcopy)
>  
> -vmlinux.bin.all-y := $(obj)/vmlinux.bin
> -
>  suffix-$(CONFIG_KERNEL_GZIP)  := gz
>  suffix-$(CONFIG_KERNEL_BZIP2) := bz2
>  suffix-$(CONFIG_KERNEL_LZ4)  := lz4
> @@ -67,17 +65,17 @@ suffix-$(CONFIG_KERNEL_LZMA)  := lzma
>  suffix-$(CONFIG_KERNEL_LZO)  := lzo
>  suffix-$(CONFIG_KERNEL_XZ)  := xz
>  
> -$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,gzip)
> -$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,bzip2_with_size)
> -$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lz4_with_size)
> -$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzma_with_size)
> -$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzo_with_size)
> -$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,xzkern_with_size)
>  
>  LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T
> diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
> index 8ea880b7c3ec..d04e0e7de0b3 100644
> --- a/arch/s390/boot/compressed/Makefile
> +++ b/arch/s390/boot/compressed/Makefile
> @@ -58,8 +58,6 @@ OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section
>  $(obj)/vmlinux.bin: vmlinux FORCE
>  	$(call if_changed,objcopy)
>  
> -vmlinux.bin.all-y := $(obj)/vmlinux.bin
> -
>  suffix-$(CONFIG_KERNEL_GZIP)  := .gz
>  suffix-$(CONFIG_KERNEL_BZIP2) := .bz2
>  suffix-$(CONFIG_KERNEL_LZ4)  := .lz4
> @@ -68,19 +66,19 @@ suffix-$(CONFIG_KERNEL_LZO)  := .lzo
>  suffix-$(CONFIG_KERNEL_XZ)  := .xz
>  suffix-$(CONFIG_KERNEL_ZSTD)  := .zst
>  
> -$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,gzip)
> -$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,bzip2_with_size)
> -$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lz4_with_size)
> -$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzma_with_size)
> -$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzo_with_size)
> -$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,xzkern_with_size)
> -$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,zstd22_with_size)
>  
>  OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed
> diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
> index a6808a403f4b..591125c42d49 100644
> --- a/arch/sh/boot/compressed/Makefile
> +++ b/arch/sh/boot/compressed/Makefile
> @@ -47,17 +47,15 @@ $(obj)/vmlinux: $(addprefix $(obj)/, $(OBJECTS)) FORCE
>  $(obj)/vmlinux.bin: vmlinux FORCE
>  	$(call if_changed,objcopy)
>  
> -vmlinux.bin.all-y := $(obj)/vmlinux.bin
> -
> -$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,gzip)
> -$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,bzip2_with_size)
> -$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzma_with_size)
> -$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,xzkern_with_size)
> -$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
> +$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
>  	$(call if_changed,lzo_with_size)
>  
>  OBJCOPYFLAGS += -R .empty_zero_page
> -- 
> 2.32.0
>
diff mbox series

Patch

diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile
index 2640f72d69ce..877a7099b5e1 100644
--- a/arch/parisc/boot/compressed/Makefile
+++ b/arch/parisc/boot/compressed/Makefile
@@ -58,8 +58,6 @@  OBJCOPYFLAGS_vmlinux.bin := -R .comment -R .note -S
 $(obj)/vmlinux.bin: vmlinux FORCE
 	$(call if_changed,objcopy)
 
-vmlinux.bin.all-y := $(obj)/vmlinux.bin
-
 suffix-$(CONFIG_KERNEL_GZIP)  := gz
 suffix-$(CONFIG_KERNEL_BZIP2) := bz2
 suffix-$(CONFIG_KERNEL_LZ4)  := lz4
@@ -67,17 +65,17 @@  suffix-$(CONFIG_KERNEL_LZMA)  := lzma
 suffix-$(CONFIG_KERNEL_LZO)  := lzo
 suffix-$(CONFIG_KERNEL_XZ)  := xz
 
-$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,gzip)
-$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,bzip2_with_size)
-$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lz4_with_size)
-$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzma_with_size)
-$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzo_with_size)
-$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,xzkern_with_size)
 
 LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 8ea880b7c3ec..d04e0e7de0b3 100644
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -58,8 +58,6 @@  OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section
 $(obj)/vmlinux.bin: vmlinux FORCE
 	$(call if_changed,objcopy)
 
-vmlinux.bin.all-y := $(obj)/vmlinux.bin
-
 suffix-$(CONFIG_KERNEL_GZIP)  := .gz
 suffix-$(CONFIG_KERNEL_BZIP2) := .bz2
 suffix-$(CONFIG_KERNEL_LZ4)  := .lz4
@@ -68,19 +66,19 @@  suffix-$(CONFIG_KERNEL_LZO)  := .lzo
 suffix-$(CONFIG_KERNEL_XZ)  := .xz
 suffix-$(CONFIG_KERNEL_ZSTD)  := .zst
 
-$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,gzip)
-$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,bzip2_with_size)
-$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lz4_with_size)
-$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzma_with_size)
-$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzo_with_size)
-$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,xzkern_with_size)
-$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,zstd22_with_size)
 
 OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index a6808a403f4b..591125c42d49 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -47,17 +47,15 @@  $(obj)/vmlinux: $(addprefix $(obj)/, $(OBJECTS)) FORCE
 $(obj)/vmlinux.bin: vmlinux FORCE
 	$(call if_changed,objcopy)
 
-vmlinux.bin.all-y := $(obj)/vmlinux.bin
-
-$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,gzip)
-$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,bzip2_with_size)
-$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzma_with_size)
-$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,xzkern_with_size)
-$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
+$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,lzo_with_size)
 
 OBJCOPYFLAGS += -R .empty_zero_page