parisc: decompressor: remove repeated depenency of misc.o
PATCH 1/2 parisc: decompressor: remove repeated depenency of misc.o
The same dependency
$(obj)/misc.o: $(obj)/sizes.h
... appears twice, at line 29 and line 55 in this Makefile.
Remove the second one.
Signed-off-by Masahiro Yamada <[email protected]>
---
arch/parisc/boot/compressed/Makefile | 2 -- 1 file changed, 2 deletions(-)
arch/parisc/boot/compressed/Makefile +0 -2
@@ -52,8 +52,6 @@ $(obj)/real2.o: $(obj)/real2.S $(obj)/real2.S: $(srctree)/arch/$(SRCARCH)/kernel/real2.S $(call cmd,shipped) -$(obj)/misc.o: $(obj)/sizes.h - CPPFLAGS_vmlinux.lds += -I$(objtree)/$(obj) -DBOOTLOADER $(obj)/vmlinux.lds: $(obj)/sizes.h
Signature · 1 line
2.30.2
PATCH 2/2 parisc: decompressor: clean up Makefile
Do not list the same objects in 'OBJECTS' and 'targets'.
Instead, add $(OBJECTS) to 'targets'.
Signed-off-by Masahiro Yamada <[email protected]>
---
arch/parisc/boot/compressed/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/parisc/boot/compressed/Makefile +3 -4
@@ -9,9 +9,10 @@ KCOV_INSTRUMENT := n GCOV_PROFILE := n UBSAN_SANITIZE := n +OBJECTS := head.o real2.o firmware.o misc.o piggy.o targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4 -targets += misc.o piggy.o sizes.h head.o real2.o firmware.o +targets += $(OBJECTS) sizes.h targets += real2.S firmware.c KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER
@@ -23,10 +24,8 @@ ifndef CONFIG_64BIT KBUILD_CFLAGS += -mfast-indirect-calls endif -OBJECTS += $(obj)/head.o $(obj)/real2.o $(obj)/firmware.o $(obj)/misc.o $(obj)/piggy.o - LDFLAGS_vmlinux := -X -e startup --as-needed -T -$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) $(LIBGCC) FORCE +$(obj)/vmlinux: $(obj)/vmlinux.lds $(addprefix $(obj)/, $(OBJECTS)) $(LIBGCC) FORCE $(call if_changed,ld) sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\|parisc_kernel_start\)$$/\#define SZ\2 0x\1/p'
Signature · 1 line
2.30.2
Helge Deller
maintainerQuoted 9 lines · Masahiro Yamada
The same dependency
$(obj)/misc.o: $(obj)/sizes.h... appears twice, at line 29 and line 55 in this
Makefile.Remove the second one.
Signed-off-by Masahiro Yamada <[email protected]>
I've appplied both patches.
Thanks!
Helge
Quoted 19 lines
---
arch/parisc/boot/compressed/Makefile | 2 -- 1 file changed, 2 deletions(-)arch/parisc/boot/compressed/Makefile +0
-2@@ -52,8 +52,6 @@ $(obj)/real2.o: $(obj)/real2.S $(obj)/real2.S: $(srctree)/arch/$(SRCARCH)/kernel/real2.S $(call cmd,shipped) -$(obj)/misc.o: $(obj)/sizes.h - CPPFLAGS_vmlinux.lds += -I$(objtree)/$(obj) -DBOOTLOADER $(obj)/vmlinux.lds: $(obj)/sizes.h