From patchwork Mon Dec 3 07:50:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152682 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512896ljp; Sun, 2 Dec 2018 23:52:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/WtnKcnmbS0Aap9OpU+zxFS38zo38o8VnS13eS1Z85KhBMQ19zU4JW3IUY4J/xXAgmkBK9W X-Received: by 2002:a62:3c1:: with SMTP id 184mr2821967pfd.56.1543823567724; Sun, 02 Dec 2018 23:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823567; cv=none; d=google.com; s=arc-20160816; b=u3dp3ij/u+CJm69Xc1X0B3s9WsAC7fkon9tqmQIHVfp7hqFaolubpP5wKc3EFBs4l+ kHMtIQ+X7yr89tGTneSyN0iaPmnZA/kxIWGQw6v72fmKv72YQNoAHtyl7sMvbNOQAsNi QpOnecj4zmwYTfAlxXuYz/xbZYmPkEJtcwE4iZFW9E/ld+38rCJJ1qQsna+ATEiCu4bi gB7F+0VxLnF+ayUCkJmwev46Yel5w+qy1K35geOSNYyECq0d5BuXP4+5Cp9r9YAH1oos l0pf1EVsMyufPcMhAJ0y5HijqYW5vpey0vMhWRJ7OwNDHYTGlI34/frIjodN/6iMz3qE UU+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=dCLplUBM+3R1bEdXjczaPed5zfwez0ZYRnU/1stqcvM=; b=HwCkLzGKo9qGBCMREJEYKRN0DtVubfj1FVyUuSKRiiGNk93MYIkdDMTo+sI5/9wJLI u3W822qPxXFYvV8n6wCKGsf3aIbXcRDfkYVx5U2gHfXGKbDjuT7E1Orv1TseXGmJgfeK d5Vq7O5cLORFIkNLtKCjrPxjBsESpyf0nBZ2CjatYq4Sj6oojowYuB9EjZfOftBR/rAJ 7Vk03OFrcVNWbqb7Vo0r70Vbd2+gZOWp07xZmUb+li9gDrfNHL5lf/IBjZQ5Gj5fHnqV W67Yy91XJx5CcLGJgrXQYvNFRmlzD33OHzbI8shxwNEMaPdYDSQR+KAHedKNVk7D2vDW 5y7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=co1Q0A6S; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t64si11888873pgd.202.2018.12.02.23.52.47; Sun, 02 Dec 2018 23:52:47 -0800 (PST) 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 header.s=dec2015msa header.b=co1Q0A6S; 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 S1725870AbeLCHvp (ORCPT + 32 others); Mon, 3 Dec 2018 02:51:45 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60228 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725842AbeLCHvp (ORCPT ); Mon, 3 Dec 2018 02:51:45 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O2009296; Mon, 3 Dec 2018 16:51:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O2009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823465; bh=dCLplUBM+3R1bEdXjczaPed5zfwez0ZYRnU/1stqcvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=co1Q0A6S09DDXYdLbai/ARiMGRuDBTzjrztRh3tKnHV6lLzqM+7p1ZW8uykqIeZ3B Z5mSPpNSOtsMDChV2kO+V+DrN1/CXWePoZxwg3+aLsjiqLsWzVLZMAp0ZkTDkOgMTT +EEYd22lpK/IJVIwWYc1SVxNdMMoHRD+gazX31L+x71aB/lUu0NrSgscWkazKAiA+s DpqyMwt8Y2AdzjhHCTxj4nonDzbhGwjyGKuZWYgwL6yWs+8MGOUaQLbhdFq6FIcITn j6ZrkxQOd3Ps07Fvz3rW0vIdoMZISub/EIbG7kKPtRONjIYal+yTdNgvPd3toJenjK hL5OIO32hYfSQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/7] microblaze: fix cleaning of boot images Date: Mon, 3 Dec 2018 16:50:51 +0900 Message-Id: <1543823457-32478-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The simpleImage.
target generates the following files: arch/microblaze/boot/simpleImage.
arch/microblaze/boot/simpleImage.
.ub arch/microblaze/boot/simpleImage.
.strip arch/microblaze/boot/simpleImage.
.unstrip However, "make ARCH=microblaze clean" only cleans up the unstrip image. Fix the clean-files to take care of all the four. Adding linux.bin.ub to clean-files is redundant because it is already added into "targets". Signed-off-by: Masahiro Yamada --- arch/microblaze/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 Reviewed-by: Michal Simek diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 600e5a1..e8684a2 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -37,4 +37,4 @@ $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,strip,.strip) @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' -clean-files += simpleImage.*.unstrip linux.bin.ub +clean-files += simpleImage.* From patchwork Mon Dec 3 07:50:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152676 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512132ljp; Sun, 2 Dec 2018 23:51:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/VqXVFhGktFVPFmh8zpUd2NVFgqrRzH37KjZVXsCm5rfcptnrHRyMuiAJkVcWYMeNetu3aH X-Received: by 2002:a63:2d46:: with SMTP id t67mr11478669pgt.140.1543823505723; Sun, 02 Dec 2018 23:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823505; cv=none; d=google.com; s=arc-20160816; b=fgpnxHRQAM/LPxZ/hU2LUki2uTXlizIF8I33WS9+YtX8vGYTE+6zdFq6+RbPaJY0tK GxC4H8hRgXYGPyltlv3jNQ08fCbVGQVtiH4v7DID087h/Ol7I0xUJO9mn6IoVBCw4FaZ NCIRPtTdI3QniR2/zamsi46ixjIE63RF2bz/Cn3wuSTRGWyIhLjETDfbmSozfFdt3hac exrAhvbqDRph/efavADtCCTVO6jjQ08QKCmynovcHW29q3igMdCUWEBnyuF29DP2jbb8 Mtwmlj6uWTs1TTfPJneo2NF3eq9rGM6IVebyhmimRR5RhmL/LxnPORXqCv43WVdGQO78 OcBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=X+Ozr6bkbkkxWvX5eFcOqnRQyZl1A0qa0bpJxN9vF1M=; b=tJ2sbiQDz+V+DLTCk8a0wF6v9OSPYspsQ+v64QXIsbGB9kzUyt8Ut9fbI/jMm/Bf9m u67sSL6lmWvneXEIXdDjpZe5qiPjWktvzTlRdgK2Ym0drLwvLqzo3ZWU9Z1tLot+mozF C46k4B3gNE1J9pVpPNP3cdymoQV8OWZGQAMMEpOKA2DMsaCLwaYS8cN098V2QfNonq7Z TdRfmd84b4g+15eCYXgfDhmAv2n6HejltyvbTaaBSiWfs8dAQpMzQrP9WwAepHTZcUQp vCKszFb0QTbE4Vw/lbFdm0mqAC2Ob/RLH8GLNdiLdARwDVKd2Yff32tLDIoFZVHHyhZi Cajw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=D1aZ88oQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11si12178583pgf.452.2018.12.02.23.51.45; Sun, 02 Dec 2018 23:51:45 -0800 (PST) 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 header.s=dec2015msa header.b=D1aZ88oQ; 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 S1725937AbeLCHvs (ORCPT + 32 others); Mon, 3 Dec 2018 02:51:48 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60226 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbeLCHvp (ORCPT ); Mon, 3 Dec 2018 02:51:45 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O3009296; Mon, 3 Dec 2018 16:51:06 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O3009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823466; bh=X+Ozr6bkbkkxWvX5eFcOqnRQyZl1A0qa0bpJxN9vF1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1aZ88oQU7buOx7u7Z7XmXYq07dthDQsllFU/J2lWxPfDVpDDj+LeUx8m0uNXap0d 8uPs6M35aPTOAH4D564THzMJNCXpBr8wx3pF9N3zIAuYxifegzaFdC4YPWT2prDInM n8pa3AW5yPiaTszt6kmgmkNb3ELxSeoICXWjzf3JQMWeVile8NhDVBWGOMQhrYzBx4 n7Z7gDLiWHB2o1mP5PD8uHdUiOUz45cfLOewNYTyVeHeitvQ5nt4PW9GZ2HjidQwLB pekTXRm9JSjQZB0VKzwhLybFvIRliI+7hKXArdy0/Gll7RjnWjxEdq5Uz4lryxlDhO m8hhBfA2lEAng== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/7] microblaze: adjust the help to the real behavior Date: Mon, 3 Dec 2018 16:50:52 +0900 Message-Id: <1543823457-32478-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "make ARCH=microblaze help" mentions simpleImage.
.unstrip, but it never works because Makefile assumes "system.unstrip" is the name of DT. $ make ARCH=microblaze CROSS_COMPILE=microblaze-linux- simpleImage.system.unstrip [ snip ] make[1]: *** No rule to make target 'arch/microblaze/boot/dts/system.unstrip.dtb', needed by 'arch/microblaze/boot/dts/system.dtb'. Stop. make: *** [Makefile;1060: arch/microblaze/boot/dts] Error 2 make: *** Waiting for unfinished jobs.... Rip off the never-working target. In my understanding, simpleImage.
works like a phony target that generates multiple images. Reflect the behavior to the help message. Signed-off-by: Masahiro Yamada --- arch/microblaze/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 0823d29..97e1384 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -89,9 +89,7 @@ define archhelp echo '* linux.bin - Create raw binary' echo ' linux.bin.gz - Create compressed raw binary' echo ' linux.bin.ub - Create U-Boot wrapped raw binary' - echo ' simpleImage.
- ELF image with $(arch)/boot/dts/
.dts linked in' - echo ' - stripped elf with fdt blob' - echo ' simpleImage.
.unstrip - full ELF image with fdt blob' + echo ' simpleImage.
- Create images with $(arch)/boot/dts/
.dts linked in' echo ' *_defconfig - Select default config from arch/microblaze/configs' echo '' echo ' Targets with
embed a device tree blob inside the image' From patchwork Mon Dec 3 07:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152680 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512690ljp; Sun, 2 Dec 2018 23:52:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/VSzr1vr/3tnbZcmTpcpS+2kl97sjQtRJREfmqPUz5iZ1aq/CAGJPxGzkNllGzH1xCw5nam X-Received: by 2002:a63:2c0e:: with SMTP id s14mr12631285pgs.132.1543823550413; Sun, 02 Dec 2018 23:52:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823550; cv=none; d=google.com; s=arc-20160816; b=N/2fwOycbBnASNvdAQWwtMcn3cBTImC1Mb2dp+MBLQsTua0NlxasAXLDrh6aEE3f9j SzXIq6ovqKnPxG66QQQPLYEFpNF1hNMWavDw1KHJeKarplYlGHjhA/EeMWwxek7vsOIJ RjCYJmLl1lQNvQC3+oB9qzdBmXQMRDak2AQgv5lKPUYsSWJDe+kvUrNjndNOz3ECIUjP 3ovFuTxaKnWFZSG8p9A9axcqKCbHAyBXQC9twZhlC4pFjT9cj1QHRqvqV00kLA0t53Io hcYK0Zx1qMtgY6e+Nj+2CVB0KrC1KZRhk9IhphgC05lVXALBVKNTlgeLxcf0pJ0rKLYr fmRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=Vb/3OPGyTEOlXKRrpP3pR6+EXfznXh75TNXsZGFgG5Q=; b=ahfOya3eOheCYJRMzkXzy10e8y7IicyccnpxW1DPotTWDTw+hSP2CzvNMHTo7uLNfg IC+lBN4Qexu3y9EYN8A9Xj5HpjjRq/xHrJX1EBV5Wzkm1bTFM0AqnPC8Zp6EdcYGz1YZ ElGOuT9NStXyAnB9/8VWYkOXs84fLqEmGpEPQ0MDM80TwiItbvI/hIKQ05w6SvQ59cDA Zzv79LXmWp4vfDlZrgBYFZDxyzYxwtLBzQ3THw02s+XOmnT9mU2Q+5sE16xoLciwltT5 9XehaNLNbmfBRSf7YSoTkP3X7DG/Dcr9RbrYCOqCFuIfM/YTOcZ04jzSqvk10bAJzGb7 Eajg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UosMbsE9; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c4si12676654pfi.110.2018.12.02.23.52.30; Sun, 02 Dec 2018 23:52:30 -0800 (PST) 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 header.s=dec2015msa header.b=UosMbsE9; 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 S1725911AbeLCHvq (ORCPT + 32 others); Mon, 3 Dec 2018 02:51:46 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60222 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725835AbeLCHvp (ORCPT ); Mon, 3 Dec 2018 02:51:45 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O4009296; Mon, 3 Dec 2018 16:51:06 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O4009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823466; bh=Vb/3OPGyTEOlXKRrpP3pR6+EXfznXh75TNXsZGFgG5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UosMbsE9r86oY8zuhVPhKXTYvfuO+KGkDW/MfMF0ZL9Fg6V9k67jxJz4J4UHniaMg ZyDwApNHqd+KjJvC2okGlAIzRY9gfsrToRdiunxTuVd8xGQdvOMsoOHmP0bJbdIo7k 7fZ1Mxn9+AogTfDLbtaZOoyD2hUbAzN+rEBcHsxsb93b7HHrS0CoQ7j4kXO2mTHrBG /YY0VqtAly3JGbW9jAuX/c38ef6mEQMdy3xHi3v18Vcl1/5XmZ100ewlpGCZrfee0V EtjmsQezg7LvUKzgOsHXV818M71ZKxIDMqI0hnBXCIESHca099DjRKjUj5KzNmABQ2 KLhuUAOPzp0uw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/7] microblaze: move "... is ready" message to arch/microblaze/Makefile Date: Mon, 3 Dec 2018 16:50:53 +0900 Message-Id: <1543823457-32478-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To prepare for more fixes, move this to arch/microblaze/Makefile. Otherwise, the same "... is ready" would be printed multiple times. (Another solution would be, to remove these messages entirely unless people persist with them.) Signed-off-by: Masahiro Yamada --- arch/microblaze/Makefile | 2 ++ arch/microblaze/boot/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 97e1384..cfd7bfca 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -81,9 +81,11 @@ archclean: linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp echo '* linux.bin - Create raw binary' diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index e8684a2..c2579a7 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -9,15 +9,12 @@ OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary $(obj)/linux.bin: vmlinux FORCE $(call if_changed,objcopy) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(call if_changed,uimage) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) @@ -35,6 +32,5 @@ $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,objcopy) $(call if_changed,uimage) $(call if_changed,strip,.strip) - @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.* From patchwork Mon Dec 3 07:50:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152681 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512734ljp; Sun, 2 Dec 2018 23:52:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/WMeKXk/GdXkewxJ7H97TjYrIkj9bwQYKNRxGz0ytMvMy7h4muBn3ERUPdZXeKdu3p5SHku X-Received: by 2002:a63:608f:: with SMTP id u137mr12566654pgb.203.1543823553241; Sun, 02 Dec 2018 23:52:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823553; cv=none; d=google.com; s=arc-20160816; b=BfLY3yDS9rli9jNNcF2OHDDPi8aPjo7Ei5RNaylhzu1vai05wmaWHMxz5naQOxWCqR lb2uFFlPQMoo/iLqbFj4LQW+eevHnaed4KcL4atEPAyryNVGU40E6lKcbsJ6VzaAOjBm tnVV794gG98TcMoKThIpjI3hacfgVhyD3UdsAFFq0ZkBo2oscrrUwCRvZ7m5PFJpVXir pcAKp92tOpvwyohXJ0AwMXV/+N4FQra+o5okkiKuo9f7Nn3oH/xrvAxjlrbX2U4iOR78 ErO84fxpgAelAlAwa87bc7zbP+C8Wc0Z+Wcfr9wR5q750yE9MWQTKhLdsGnNjZHzwg4S tzYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=N3TI1A9AeQ18M6YQzJK3Suotjnv/hQbugG9ua8UooFo=; b=P+0H8tFPs5XwjFXftPENtGityXfAhwx1BkFvJd4mWF4N5qH/+jKbNU/9YStrxozOFi KUSEVIGEOQeJWna2zdE/BCDrPe8rLHIv0VPNeHacI7Z0d7kzg8c0b/AJ//ufJypDsBJd NGtJYLrCbA2IXASKhSKnjKi4vhOntfdVBLIXglonMzEE/o0PXDvmzXTzaxO8Zpd5q0eC zKt14qfTXfFVPn8naZAeusinPehn3Q4X9/FkTcBWwwSOXx1nhVajYpYFGjEUDCYRtqrk 7FirkFlfStWIdPVnD9+3ighbAGheS14WUgTObh4OgOKSMb3RpdgFcPLE+qHiWswJQ8Zw bYeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=qOXUclZn; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c4si12676654pfi.110.2018.12.02.23.52.32; Sun, 02 Dec 2018 23:52:33 -0800 (PST) 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 header.s=dec2015msa header.b=qOXUclZn; 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 S1726039AbeLCHwf (ORCPT + 32 others); Mon, 3 Dec 2018 02:52:35 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60223 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725837AbeLCHvq (ORCPT ); Mon, 3 Dec 2018 02:51:46 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O5009296; Mon, 3 Dec 2018 16:51:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O5009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823467; bh=N3TI1A9AeQ18M6YQzJK3Suotjnv/hQbugG9ua8UooFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qOXUclZnmGfmbYye2xzrhTbJ/HPvgbKywwAONv2rDzg78K8m8PKV9PCdRZFgF02DQ FQMPA8LE07kjpVBXJZc6Q2yNhdZ4yhedK0twttF9zlLsh488j5/DarYqqwy1lpbe/G tPLBPPTreOQ629DGmWsfJr13xfsoXW1u/7QQ1PPp/c6BP1SRaPNdzjKb6FvXQ6Y0Bw HcH+LeGV7AG60qaxXLRnk4+ng2siCf7p3IdJBvlvUBxKYuZUP7HUCUhFlp5TCvARvg yJAaZ/Uv2OXE4hAzanNqOuUETV+pRPe2SZbJfFXT0cAyFMWWeSYR3dZ196ndjskMH+ woaC0V4mvdXbA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/7] microblaze: fix multiple bugs in arch/microblaze/boot/Makefile Date: Mon, 3 Dec 2018 16:50:54 +0900 Message-Id: <1543823457-32478-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This Makefile is wrong in multiple ways. The first issue is the breakage of 'linux.bin.ub' target since commit ece97f3a5fb5 ("microblaze: Fix simpleImage format generation") because the addition of UIMAGE_{IN,OUT} obviously affected it. make ARCH=microblaze CROSS_COMPILE=microblaze-linux- linux.bin.ub [ snip ] OBJCOPY arch/microblaze/boot/linux.bin UIMAGE arch/microblaze/boot/linux.bin.ub.ub /usr/bin/mkimage: Can't open arch/microblaze/boot/linux.bin.ub: No such file or directory make[1]: *** [arch/microblaze/boot/Makefile;14: arch/microblaze/boot/linux.bin.ub] Error 1 make: *** [arch/microblaze/Makefile;83: linux.bin.ub] Error 2 The second issue is the use of the "if_changed" multiple times for the same target. As commit 92a4728608a8 ("x86/boot: Fix if_changed build flip/flop bug") pointed out, this never works properly. Moreover, generating multiple images as a side-effect is extremely confusing and wrong. As far as I understood, "simpleImage.
" works like a phony target to generate the following four images. - arch/microblaze/boot/simpleImage.
: identical to arch/microblaze/boot/linux.bin - arch/microblaze/boot/simpleImage.
.unstrip: identical to vmlinux - arch/microblaze/boot/simpleImage.
.ub: identical to arch/microblaze/boot/linux.bin.ub - arch/microblaze/boot/simpleImage.
.strip: stripped vmlinux The first three are just aliases of other images. Separate the recipe for each image. Signed-off-by: Masahiro Yamada --- arch/microblaze/Makefile | 2 +- arch/microblaze/boot/Makefile | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) -- 2.7.4 Acked-by: Michal Simek diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index cfd7bfca..c5d5b0e 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -84,7 +84,7 @@ linux.bin linux.bin.gz linux.bin.ub: vmlinux @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot) simple_images @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index c2579a7..f12a9d7 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -3,7 +3,7 @@ # arch/microblaze/boot/Makefile # -targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.% +targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.*.strip OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary @@ -16,21 +16,26 @@ $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - quiet_cmd_strip = STRIP $< $@$2 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ -K _fdt_start $< -o $@$2 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) -UIMAGE_IN = $@ -UIMAGE_OUT = $@.ub -$(obj)/simpleImage.%: vmlinux FORCE - $(call if_changed,cp,.unstrip) - $(call if_changed,objcopy) - $(call if_changed,uimage) - $(call if_changed,strip,.strip) +PHONY += simple_images +simple_images: $(addprefix $(obj)/simpleImage., $(DTB) $(DTB).ub $(DTB).unstrip $(DTB).strip) + @: + +$(obj)/simpleImage.$(DTB): $(obj)/linux.bin + $(call cmd,shipped) + +$(obj)/simpleImage.$(DTB).ub: $(obj)/linux.bin.ub + $(call cmd,shipped) + +$(obj)/simpleImage.$(DTB).unstrip: vmlinux + $(call cmd,shipped) + +$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE + $(call if_changed,strip) clean-files += simpleImage.* From patchwork Mon Dec 3 07:50:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152675 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512104ljp; Sun, 2 Dec 2018 23:51:43 -0800 (PST) X-Google-Smtp-Source: AFSGD/VTjvP77OYRRHPoWc7AdA/XdmlfaU7lIFifztmEI5ENq1NmJdklMYyP/yI1HiXg8ARBbwIB X-Received: by 2002:a62:2a4b:: with SMTP id q72mr14693089pfq.61.1543823503814; Sun, 02 Dec 2018 23:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823503; cv=none; d=google.com; s=arc-20160816; b=0xiBTks/nJiUXkaWVp4EyaSHpytQdr0tSPy1D4bSp56Q7GzpvdshEFkCq+fJAXahEw 5jx5+Bj1VffbdWfnEynMFaSYh2d+ZiXFTsf8DBYXx1BILr/HPkwwBF8U8MonCiaFztbE t+uFcX97ewmKLe2ThI5RY5rQdvw5kg4CIFpZ/HPWlE+jb9xPLlZw3IrOddR+NthAl32B UdJydJzm4Pn99ncvGfFdOPQ68KdevQ+bPgXuw+ZSz45QiC0kHXn4LhpEyTvD8/HzIW3w UgxoT7n6k/5DA2Fc9olMdMZz67X2Svhh1TM9HDLq6DyUuGxuQNEPStqxcKkdswmG1/xB /zqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=FqpO5zyD2YzdwZn60QrxTfZLs1HKycrr9Un4ocfeCp0=; b=oeJ3B4VeCDevP1dsWgcXyN3k/2rbM8FyeWj8lsUGZv1KoWBdEq6OTFers8CG8ch36Y ORAOC4gFIy2e6V7OY/XNlKyWMxe7jOmdlDjo/18D2I4kbUCVnoR4gUM1WkSCRmS5tBlo YYtiu7Ox5lkXpVL32S8U1Z0EEd3DafiwGpTp9lM//uh7KQn9Ct5O3yUjbtNKjDDghjw8 mqnkWzSZy+P9z74Qlwm39ZTI8vyTZoxq/In+N7uhO90GAQN1oQ2Fdho0WTqTPgm3JQXz aPW4+Zh0HTJLvugDWMq55Znjxk4OGxCRBluFwTY/rdDmaic81/uBSo3ASluTTc4iCCGM 0SFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=EH0dGTpS; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11si12178583pgf.452.2018.12.02.23.51.43; Sun, 02 Dec 2018 23:51:43 -0800 (PST) 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 header.s=dec2015msa header.b=EH0dGTpS; 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 S1725893AbeLCHvp (ORCPT + 32 others); Mon, 3 Dec 2018 02:51:45 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60227 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725845AbeLCHvp (ORCPT ); Mon, 3 Dec 2018 02:51:45 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O6009296; Mon, 3 Dec 2018 16:51:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O6009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823468; bh=FqpO5zyD2YzdwZn60QrxTfZLs1HKycrr9Un4ocfeCp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EH0dGTpSvfi7tLAoqRthaOukjr3aF6e5c12jc0poD3DMKbnmLQaMmEpwea5mygBTo SlqFCaNd7+9WMnwKtBFIBRHr6AHKlyOltByXcWVAy8sJiyMr8xwenYXw+Ap+og7Q3h Bf230MH+FMvDz4YTdjaAaDvCBZ79X7X9I9igA3paNuEbl9GCpSrOjQ4MpgdWYEMCG9 Wv49gXnotJ5PVrLcfM/PR1ZgMW+wpnQGRln+PSOGUY3/23Vbjtxb61dqV4pSXnIrf4 Wd84u+NgbLvWkLd4o7OYlhiAcX6ssZZAqWpV6OTE2+7C0/CWOeIkkgscwasWD7eg5W aLjKoRWyTobGg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 5/7] microblaze: add linux.bin* and simpleImage.* to PHONY Date: Mon, 3 Dec 2018 16:50:55 +0900 Message-Id: <1543823457-32478-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org linux.bin, linux.bin.gz, and linux.bin.ub are phony targets to generate a corresponding image under arch/microblaze/boot/. simpleImage.% also works like a PHONY target, but a pattern that contains '%' cannot be a PHONY target. I renamed it to equivalent simpleImage.$(DTB). Signed-off-by: Masahiro Yamada --- arch/microblaze/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 Acked-by: Michal Simek diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index c5d5b0e..7a5df02 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -79,11 +79,13 @@ all: linux.bin archclean: $(Q)$(MAKE) $(clean)=$(boot) +PHONY += linux.bin linux.bin.gz linux.bin.ub linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' -simpleImage.%: vmlinux +PHONY += simpleImage.$(DTB) +simpleImage.$(DTB): vmlinux $(Q)$(MAKE) $(build)=$(boot) simple_images @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' From patchwork Mon Dec 3 07:50:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152677 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512182ljp; Sun, 2 Dec 2018 23:51:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/W8zzEizJ/z7BnGijQFQ3A7jLTOB9cx/UOlMxyfBo2To1TT1BfCWJuocJgAG0Wf32dmB5jo X-Received: by 2002:a62:160d:: with SMTP id 13mr14730872pfw.203.1543823510144; Sun, 02 Dec 2018 23:51:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823510; cv=none; d=google.com; s=arc-20160816; b=AUBZxCeARStnnDiTzAzB2s0qDKZwy5mPQ1DqKltwttXCnndUSZ0K3xcBU7co0F+lcA UkDmoGU6+bTnwfThUzrlqdvgXqq1kcso8ujn2PzFdToQtUystIumhgv8eWKDJtAU7l1K AT373I+y5Viq7g1n+5YI0rvCujflPlmXxosTS+nQfFdNkdC9PX3Tw2F6aFNLVpd2gyJq ee/ZWzcPFfVUIQJBKyWzFT8QP4WKTkLomYCKpngLTv0h/Qr1K/ottH70kkymDuO9gDhM TIo/3upCTIWkdRhzTMtbk760s76kSc7lCq+wYdhIhj1ZL3Ie7bAUJ/uBv1w0J7NdLNXa ihmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=/bkD1AaEj77ORfzeA5lP0B9fBeG7hxBuHP/+JIDuorc=; b=rSn3W8djcTkrJdABiHjnX4Qio6Tuj4c5poPQ09kUtHMuPcgo8si/krw2J3NiBTf9HS eAXN7T06WFSS2P/eHZCpmSozmt5r51Xya0epgWleb2N7DB3NM6DfbSiwQvn74TrqG3ZW jlWwJa9iqYWW7F3g+wA6sBdsm5GfLGmKmvTi7UNXl8e3rmYYuvuBe3CTKzjY61XLX2xH rrsHgh3dDI/WWxgWdqZFcBab8zc+JVXgml8DFV82rvQtix35iEx5Ch8a9wyiibK8mFTm 4wNpXrOFyVMAR+w60xXXx4hNqDYljaAJz8cKaydSjupAIuVjQ8IrbjrpDQBJHTo0NH9u zlsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="gYi/FM64"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p127si13519080pfp.119.2018.12.02.23.51.49; Sun, 02 Dec 2018 23:51:50 -0800 (PST) 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 header.s=dec2015msa header.b="gYi/FM64"; 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 S1725924AbeLCHvr (ORCPT + 32 others); Mon, 3 Dec 2018 02:51:47 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60224 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725832AbeLCHvp (ORCPT ); Mon, 3 Dec 2018 02:51:45 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O7009296; Mon, 3 Dec 2018 16:51:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O7009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823468; bh=/bkD1AaEj77ORfzeA5lP0B9fBeG7hxBuHP/+JIDuorc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gYi/FM64UmEWhru1vPEsWksgX7+4FHQ/yeM0vaw/7w4qb0I0gZvTdsvNSo3eqWcua xqA9aSeYGR3iM4RMZysWfwtFtqDZKyzMVPB8qw4vgRa7C/dqHu5bTcrgxYEsXFrJVd JdcNRQxDjrbdxST93V4SQpssHnUFh2VJclPjJ1JHnFDrMFZ/1bnyUhC26ANl1dUEg2 MdMw3AO6RAF/55ZBRx6ALj1KqBFEYlsd6vlC7GhW8PigLdHkF7xGaKJOsjgaWxlENs h75chG7rpwz/pMkMPDNIqWehKGUH7NmLRY2QoM1YwdFRLdDxuSX92ZAk4J0QZCUvLP sD+umS9WKn3HA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 6/7] microblaze: fix race condition in building boot images Date: Mon, 3 Dec 2018 16:50:56 +0900 Message-Id: <1543823457-32478-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I fixed a race condition in the parallel building of ARM in commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to not generate invalid images"). I see the same problem for MicroBlaze too. "make -j ARCH=microblaze all linux.bin.ub" results in a broken build since two threads descend into arch/microblaze/boot simultaneously. Add proper dependencies to avoid it. Signed-off-by: Masahiro Yamada --- arch/microblaze/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 7a5df02..544796d 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -79,13 +79,15 @@ all: linux.bin archclean: $(Q)$(MAKE) $(clean)=$(boot) +linux.bin.ub linux.bin.gz: linux.bin + PHONY += linux.bin linux.bin.gz linux.bin.ub linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' PHONY += simpleImage.$(DTB) -simpleImage.$(DTB): vmlinux +simpleImage.$(DTB): linux.bin.ub $(Q)$(MAKE) $(build)=$(boot) simple_images @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' From patchwork Mon Dec 3 07:50:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152679 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6512461ljp; Sun, 2 Dec 2018 23:52:12 -0800 (PST) X-Google-Smtp-Source: AFSGD/VJ+JzriafXwKmC1RcP4rXxUOGRIR1XUpWFUniNGj6eaZlWtsII933CN3LGRWQArn1CDVaR X-Received: by 2002:a63:b54f:: with SMTP id u15mr12329025pgo.420.1543823531979; Sun, 02 Dec 2018 23:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543823531; cv=none; d=google.com; s=arc-20160816; b=IqMawwZmciKW6TwAxefq5spRQwXhiDHiTa0Py+0C35XWeT3PHdnUQkKPD9ERJpKNnu owON8nQ9HSNVJSAAEspmAcWjuVhHCTJrEO0Qj5jwsS2IhEzK/NHxZBdAGhEJkZLabHHo aII21UWv7olVjtn7Fh+qrysuMYQdLcaZMxGO49f8XQMHcb9chv12pz47DtkhAmG29BYW QnmDlB+k2b5Q2b5aK7EpOxi/xsJ1XXJjOJ2H+4sp3E49xurb4lChy3m02sj8zkP9kNd2 4QknJlCf20vBp1ITJTTCzssHGJGhaxiBEBTmAX7CpXZv6hRq9cq3wGPNjWMYJAV0UmNE +pOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=XuSq2PAyWJ8SgmLhjLsNRYQS3C416oLEGtt8Uth20Ws=; b=oWoHFuS6R7beGFus7P8c0AbXBhetHhB9Hw9gIh98yGaxOySf76+vv8nA0tkQtl7qHz 1DNckxe/CS580w/UDT+jfLBF0vGp8/dGnBVbYq/pC428HZOs0JcHkAZO2P3+9n4uN9G/ bNN7+kaA6UPajiChqS3wZE3JciyHr5UEba7utZ8tyHF5b4zGAtstWnCjBeThAwHweVDI uwxIOHiM+QL0YB1FNIUv64SicH8Ey6Zz251uqyZr+n16aNKa0tvEDVDZG2gSsjWu1+fF 7Z+y5xtqrrgOFS6qpI1wFVKwHm4XJf+ZPgVuaO890XroPlhRRtNmO+LhSHpzuwkISNgz PwAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=04NndtQR; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y188si14094698pfb.59.2018.12.02.23.52.11; Sun, 02 Dec 2018 23:52:11 -0800 (PST) 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 header.s=dec2015msa header.b=04NndtQR; 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 S1726002AbeLCHwO (ORCPT + 32 others); Mon, 3 Dec 2018 02:52:14 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:60442 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbeLCHvx (ORCPT ); Mon, 3 Dec 2018 02:51:53 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wB37p4O8009296; Mon, 3 Dec 2018 16:51:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wB37p4O8009296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543823469; bh=XuSq2PAyWJ8SgmLhjLsNRYQS3C416oLEGtt8Uth20Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=04NndtQRfn4Vvm379KZRYQyu4MK14Ijbe2qNkcqGdnRPsy5kp2Q15g70bWu42T6BW PcHvZyDCLiFseO6EGGwFCGXC+GQamCYTZgXZagRiE7Y15PUleK3zLehToQc95MuyUP xwWA/NpwqFsencduPmhhTvakyZ7Q21bLFGz8TTnhpmC9nEVrmeLkwAJ9EqH6VZg5e1 E2081oIsFdTvME92rIllLNtwsfj15ZJILi6wQXvDqfEiENu2hGMVIDPCd7OnmYoP5E PCOG9hMkczMVKcLMHlPMc6hW2zMp4nTy9Y1APwD/Tc4Ewo0MbFMxJL7xMrjIr6Dbbe 4qcs8YH2RgHHQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , devicetree@vger.kernel.org, Mark Rutland , Rob Herring , linux-kernel@vger.kernel.org Subject: [PATCH 7/7] microblaze: remove the unneeded code just in case file copy fails Date: Mon, 3 Dec 2018 16:50:57 +0900 Message-Id: <1543823457-32478-8-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> References: <1543823457-32478-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I guess || (rm -f $@ && echo false) ... should be || (rm -f $@ && false) since printing the string "false" on the console has no point. Moreover, no Makefile needs to delete a target on error explicitly since commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"). Reuse equivalent cmd_shipped from scripts/Makefile.lib. Signed-off-by: Masahiro Yamada --- arch/microblaze/boot/dts/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.7.4 diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile index c7324e7..ef00dd3 100644 --- a/arch/microblaze/boot/dts/Makefile +++ b/arch/microblaze/boot/dts/Makefile @@ -12,12 +12,9 @@ $(obj)/linked_dtb.o: $(obj)/system.dtb # Generate system.dtb from $(DTB).dtb ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtb - $(call if_changed,cp) + $(call if_changed,shipped) endif endif -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - # Rule to build device tree blobs DTC_FLAGS := -p 1024