From patchwork Sat Oct 30 17:57:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12594619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6EECC433EF for ; Sat, 30 Oct 2021 18:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DC6A60F55 for ; Sat, 30 Oct 2021 18:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbhJ3SDX (ORCPT ); Sat, 30 Oct 2021 14:03:23 -0400 Received: from condef-02.nifty.com ([202.248.20.67]:20357 "EHLO condef-02.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229474AbhJ3SDW (ORCPT ); Sat, 30 Oct 2021 14:03:22 -0400 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-02.nifty.com with ESMTP id 19UHwXYA032676 for ; Sun, 31 Oct 2021 02:58:33 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 19UHvPwZ014662; Sun, 31 Oct 2021 02:57:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 19UHvPwZ014662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1635616645; bh=etJG8fgowiRm3GZBJo0k5ncCkc10kCvpPeV0z+hvBdU=; h=From:To:Cc:Subject:Date:From; b=y9dgb8lGfMUT+gIx5mp2BTUxDNIzFax40lwd3ja8SD4Zis4GZp++3FUL7MziEgHv2 B6MVzJ5LR7zUnyjKXPdPaw+SOpFHK1v8OChLNIqc61O4Wcd3UA3vbeV49sesg7npkK m+/MlgA+zXPtfp+rKxYUDZOSQbcLGWzlad0ynqawwDkj6ge5ldDkU8PrH7fv0TnlOr lnmy161WTJUZNRNx0k3CYaXtRSBiSbOIRzx+7hCBM3luJA8gDkA6gTPXmRnffI6eN8 X0DFMZPFWk5Qk/RxSQ0npsgoAcjlduSs5P86UgKlagCX4vsKSXWzukC5MShBJ3zWWm h9n56Hk/xcfDw== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-parisc@vger.kernel.org, patches@arm.linux.org.uk Cc: Masahiro Yamada , Helge Deller , "James E.J. Bottomley" , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] parisc: decompressor: remove repeated depenency of misc.o Date: Sun, 31 Oct 2021 02:57:20 +0900 Message-Id: <20211030175721.1716841-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org 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 --- 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 From patchwork Sat Oct 30 17:57:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12594617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09DF4C433EF for ; Sat, 30 Oct 2021 18:00:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA11660F55 for ; Sat, 30 Oct 2021 18:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229788AbhJ3SDK (ORCPT ); Sat, 30 Oct 2021 14:03:10 -0400 Received: from condef-10.nifty.com ([202.248.20.75]:28214 "EHLO condef-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229474AbhJ3SDJ (ORCPT ); Sat, 30 Oct 2021 14:03:09 -0400 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-10.nifty.com with ESMTP id 19UHwW8m025517 for ; Sun, 31 Oct 2021 02:58:33 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 19UHvPwa014662; Sun, 31 Oct 2021 02:57:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 19UHvPwa014662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1635616648; bh=2a08r+QBj6yClHK2kfJy7guIZlg48mYzJekxt4je47k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T9DJeIJf6Hf4H+qFxQLMyb0EYtq8KHxCFaJLAoHDXvvBbRBQBv67rGTJJPasaUCzc w3J8MoA5LPPJ7JE5jddFaQuyOK1HzC+QnTVb49S+pFAc/t7j0xdDbJglBx6HCyl1P4 dKn5kF1D1oWpdLEEg1ldaXRo7bKftWjpO2+9422jPzWapa1O0c39y+X+rbgm5SdhMc 1mexHEnHnoqUpfW1EmfZqOud7F/ENq2c6EmJtxN8SUTmNLXDCl37uFCDbKU5lY9Xdj GUbeNfohIlIAZ5chw6ulW9VZ4/n+lT7tCd3kjXM9LwI0LYCdqa25c9jNZlCxbym6uu IbvqLmitBatFw== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-parisc@vger.kernel.org, patches@arm.linux.org.uk Cc: Masahiro Yamada , Helge Deller , "James E.J. Bottomley" , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] parisc: decompressor: clean up Makefile Date: Sun, 31 Oct 2021 02:57:21 +0900 Message-Id: <20211030175721.1716841-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211030175721.1716841-1-masahiroy@kernel.org> References: <20211030175721.1716841-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Do not list the same objects in 'OBJECTS' and 'targets'. Instead, add $(OBJECTS) to 'targets'. Signed-off-by: Masahiro Yamada --- 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'