* [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o
@ 2021-10-30 17:57 Masahiro Yamada
2021-10-30 17:57 ` [PATCH 2/2] parisc: decompressor: clean up Makefile Masahiro Yamada
2021-10-30 18:36 ` [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Helge Deller
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2021-10-30 17:57 UTC (permalink / raw)
To: linux-parisc, patches
Cc: Masahiro Yamada, Helge Deller, James E.J. Bottomley, linux-kernel
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 <masahiroy@kernel.org>
---
arch/parisc/boot/compressed/Makefile | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile
index 9fe54878167d..f7ed79e23c2c 100644
--- a/arch/parisc/boot/compressed/Makefile
+++ b/arch/parisc/boot/compressed/Makefile
@@ -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
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] parisc: decompressor: clean up Makefile
2021-10-30 17:57 [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Masahiro Yamada
@ 2021-10-30 17:57 ` Masahiro Yamada
2021-10-30 18:36 ` [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Helge Deller
1 sibling, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2021-10-30 17:57 UTC (permalink / raw)
To: linux-parisc, patches
Cc: Masahiro Yamada, Helge Deller, James E.J. Bottomley, linux-kernel
Do not list the same objects in 'OBJECTS' and 'targets'.
Instead, add $(OBJECTS) to 'targets'.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/parisc/boot/compressed/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile
index f7ed79e23c2c..bf4f2891d0b7 100644
--- a/arch/parisc/boot/compressed/Makefile
+++ b/arch/parisc/boot/compressed/Makefile
@@ -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'
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o
2021-10-30 17:57 [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Masahiro Yamada
2021-10-30 17:57 ` [PATCH 2/2] parisc: decompressor: clean up Makefile Masahiro Yamada
@ 2021-10-30 18:36 ` Helge Deller
1 sibling, 0 replies; 3+ messages in thread
From: Helge Deller @ 2021-10-30 18:36 UTC (permalink / raw)
To: Masahiro Yamada, linux-parisc, patches; +Cc: James E.J. Bottomley, linux-kernel
On 10/30/21 19:57, Masahiro Yamada wrote:
> 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 <masahiroy@kernel.org>
I've appplied both patches.
Thanks!
Helge
> ---
>
> arch/parisc/boot/compressed/Makefile | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile
> index 9fe54878167d..f7ed79e23c2c 100644
> --- a/arch/parisc/boot/compressed/Makefile
> +++ b/arch/parisc/boot/compressed/Makefile
> @@ -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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-30 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-30 17:57 [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Masahiro Yamada
2021-10-30 17:57 ` [PATCH 2/2] parisc: decompressor: clean up Makefile Masahiro Yamada
2021-10-30 18:36 ` [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox