Skip to content

Commit 53e7b5d

Browse files
masahir0ymasahir0y
committed
arch: decompressor: remove useless vmlinux.bin.all-y
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>
1 parent 7ce7e98 commit 53e7b5d

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

‎arch/parisc/boot/compressed/Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,24 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -R .note -S
5858
$(obj)/vmlinux.bin: vmlinux FORCE
5959
$(call if_changed,objcopy)
6060

61-
vmlinux.bin.all-y := $(obj)/vmlinux.bin
62-
6361
suffix-$(CONFIG_KERNEL_GZIP) := gz
6462
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
6563
suffix-$(CONFIG_KERNEL_LZ4) := lz4
6664
suffix-$(CONFIG_KERNEL_LZMA) := lzma
6765
suffix-$(CONFIG_KERNEL_LZO) := lzo
6866
suffix-$(CONFIG_KERNEL_XZ) := xz
6967

70-
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
68+
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
7169
$(call if_changed,gzip)
72-
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
70+
$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
7371
$(call if_changed,bzip2_with_size)
74-
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
72+
$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
7573
$(call if_changed,lz4_with_size)
76-
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
74+
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
7775
$(call if_changed,lzma_with_size)
78-
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
76+
$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
7977
$(call if_changed,lzo_with_size)
80-
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
78+
$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
8179
$(call if_changed,xzkern_with_size)
8280

8381
LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T

‎arch/s390/boot/compressed/Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section
5858
$(obj)/vmlinux.bin: vmlinux FORCE
5959
$(call if_changed,objcopy)
6060

61-
vmlinux.bin.all-y := $(obj)/vmlinux.bin
62-
6361
suffix-$(CONFIG_KERNEL_GZIP) := .gz
6462
suffix-$(CONFIG_KERNEL_BZIP2) := .bz2
6563
suffix-$(CONFIG_KERNEL_LZ4) := .lz4
@@ -68,19 +66,19 @@ suffix-$(CONFIG_KERNEL_LZO) := .lzo
6866
suffix-$(CONFIG_KERNEL_XZ) := .xz
6967
suffix-$(CONFIG_KERNEL_ZSTD) := .zst
7068

71-
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
69+
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
7270
$(call if_changed,gzip)
73-
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
71+
$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
7472
$(call if_changed,bzip2_with_size)
75-
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
73+
$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE
7674
$(call if_changed,lz4_with_size)
77-
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
75+
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
7876
$(call if_changed,lzma_with_size)
79-
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
77+
$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
8078
$(call if_changed,lzo_with_size)
81-
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
79+
$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
8280
$(call if_changed,xzkern_with_size)
83-
$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
81+
$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE
8482
$(call if_changed,zstd22_with_size)
8583

8684
OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

‎arch/sh/boot/compressed/Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,15 @@ $(obj)/vmlinux: $(addprefix $(obj)/, $(OBJECTS)) FORCE
4747
$(obj)/vmlinux.bin: vmlinux FORCE
4848
$(call if_changed,objcopy)
4949

50-
vmlinux.bin.all-y := $(obj)/vmlinux.bin
51-
52-
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
50+
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
5351
$(call if_changed,gzip)
54-
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
52+
$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
5553
$(call if_changed,bzip2_with_size)
56-
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
54+
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
5755
$(call if_changed,lzma_with_size)
58-
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
56+
$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE
5957
$(call if_changed,xzkern_with_size)
60-
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
58+
$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
6159
$(call if_changed,lzo_with_size)
6260

6361
OBJCOPYFLAGS += -R .empty_zero_page

0 commit comments

Comments
 (0)