From patchwork Mon Apr 4 02:29:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 64949 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp945452lbc; Sun, 3 Apr 2016 19:29:54 -0700 (PDT) X-Received: by 10.66.123.105 with SMTP id lz9mr1947741pab.37.1459736993885; Sun, 03 Apr 2016 19:29:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ju17si15065096pab.5.2016.04.03.19.29.53; Sun, 03 Apr 2016 19:29:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbcDDC3v (ORCPT + 29 others); Sun, 3 Apr 2016 22:29:51 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:52841 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751022AbcDDC3t (ORCPT ); Sun, 3 Apr 2016 22:29:49 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id u342SahO014573; Mon, 4 Apr 2016 11:28:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u342SahO014573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1459736917; bh=3LcHoomusTMak3sM5Tywjdl+4/JRfoCsfZr+y6nTkT8=; h=From:To:Cc:Subject:Date:From; b=2iSTaK1+C2iUx1Stfbj5o+lD5kl90W87VOcdy2vZORE5XQ/tCnV/IYogH6BfnkOu2 9a4M1etuyolF4UGTK5q2oqIKEUlpy1+DymckmD+ovRtIIM4YQhjbSxtHzAUNYfCGL8 LhRgpxpFxiC5mKLWih6tV5VIGR5PnMvtTVPwy0fn44mmJj7pnLQbLaRMVc3jRedtdP uvOk3+eFLGvdg4CUaOKS7m/3v0tXEuuF1IduCB7K8Q3KoSij9v5ljbsC7lUx5qtz8v ojg9BeEcATodSPWhJve1I1nXRh2Up08MMxoUB7zQsnWINYm2R9Htj3E/4qlppQXHFA OiGkHmdB8J6ZQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Cc: Masahiro Yamada , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: avoid duplicated "Kernel: arch/arm/boot/*Image is ready" log Date: Mon, 4 Apr 2016 11:29:30 +0900 Message-Id: <1459736970-21876-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to not generate invalid images") fixed bad image generation in case of parallel building, but as a side effect, Kbuild now descends into arch/arm/boot/ again and again, duplicating the log messages. It is clumsy, so let's display the same message only once. I moved the log rules from arch/arm/boot/Makefile to arch/arm/Makefile rather than completely deleting them, because *Image are the final targets that users are interested in. Without this commit, the log of incremental build is like follows: $ make ARCH=arm UIMAGE_LOADADDR=0x80208000 uImage CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh :1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] :1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] CHK include/generated/compile.h Kernel: arch/arm/boot/Image is ready Kernel: arch/arm/boot/Image is ready Kernel: arch/arm/boot/zImage is ready Kernel: arch/arm/boot/Image is ready Kernel: arch/arm/boot/zImage is ready Image arch/arm/boot/uImage is ready With this commit: $ make ARCH=arm UIMAGE_LOADADDR=0x80208000 uImage CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh :1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp] :1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp] CHK include/generated/compile.h Kernel: Image is ready Kernel: zImage is ready Kernel: uImage is ready Signed-off-by: Masahiro Yamada --- Changes in v2: - Do not delete, but move log rules arch/arm/Makefile | 1 + arch/arm/boot/Makefile | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8c3ce2a..2c4eb54 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -326,6 +326,7 @@ zImage: Image $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + @$(kecho) ' Kernel: $@ is ready' $(INSTALL_TARGETS): $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 5be33a2..bdc1d5a 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -31,7 +31,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) $(obj)/xipImage: vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))' + @$(kecho) ' Physical Address of xipImage: $(CONFIG_XIP_PHYS_ADDR)' $(obj)/Image $(obj)/zImage: FORCE @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)' @@ -46,14 +46,12 @@ $(obj)/xipImage: FORCE $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' endif @@ -78,14 +76,12 @@ fi $(obj)/uImage: $(obj)/zImage FORCE @$(check_for_multiple_loadaddr) $(call if_changed,uimage) - @$(kecho) ' Image $@ is ready' $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(Q)$(MAKE) $(build)=$(obj)/bootp $@ $(obj)/bootpImage: $(obj)/bootp/bootp FORCE $(call if_changed,objcopy) - @$(kecho) ' Kernel: $@ is ready' PHONY += initrd install zinstall uinstall initrd: