From patchwork Fri Dec 7 11:33: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: 153143 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp386716ljp; Fri, 7 Dec 2018 03:34:23 -0800 (PST) X-Google-Smtp-Source: AFSGD/WK1t3LY9Wv1NCJ5emUQql3ETLLj6qpMdhFiuyhuiJX0RsDGNvZKaCvrJPF2AYo+s7XRbQH X-Received: by 2002:a65:64c8:: with SMTP id t8mr1606360pgv.31.1544182463709; Fri, 07 Dec 2018 03:34:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182463; cv=none; d=google.com; s=arc-20160816; b=dvGN8V0XhEE5SfQDh6mpbLvqQY/Z8jBW8Q01UNHfFvEJ7zw2x9eFxlQWkEcZIb9vcc 9wjqy15egwmiPHIn2vz9G2lVny26/7fYBrmk4J4I3RXesR5wc12wioScaXm0Vvxa+dm8 Y6lRshEP2E/SU/OacfeS7TlRbrGjHOVDG5BTt6s721nid6VlpEpr2dfcJ/g37DKXSZx5 HgJ2rko/oxkebiekfQkXumuZoZRt/RfAOHAUa6TlBK12O6Oz3Cmgczs/ZHtdQqy1aF8d 0UFdgt7NCqhrKqlC4dYXbjcztZHrJc6euR1YJ3oK2FvCMlCBqHL6zvbGuo9g633UPid2 CAqQ== 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=b+/CYXfoOhRLJl50d2gy+TZDzV3UYeKW/v4ouoz7OoY=; b=qal5kRLs0qDt3XVfNf5ofRMpMXw5O/pB0Z3P8Zo7z8wQrxl9+4XNuFkwtklsJOKFJi Tb+Jf84dmQNnE1GuSwiV9P3w61LS4kPnHyxhM/mttOdlWiT9t2YLMVcDR9r5l1TpEk65 954czjEs2NXnUP8+W3Nv3qMXBpe3Chk2JhQpSrXSf8Ws5nKnAy7PhSSoKV9dCPmrtGET m72aSMrQG7W0wboXFBH55nlcPej/eiundUYd7pSwn5YBQddUyaXbVMnWZdmCr7IeAvK6 gLyAnQMWovVzSziISTRCAek1ovC3yKNPNOIripMeUeylnSSI2JFa3DaQlldGQAr3QwjH 2jlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=lgrb6D6C; 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 w6si2744745plp.429.2018.12.07.03.34.23; Fri, 07 Dec 2018 03:34:23 -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=lgrb6D6C; 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 S1726104AbeLGLeW (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:22 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45509 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725998AbeLGLeV (ORCPT ); Fri, 7 Dec 2018 06:34:21 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6rc020070; Fri, 7 Dec 2018 20:34:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6rc020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182447; bh=b+/CYXfoOhRLJl50d2gy+TZDzV3UYeKW/v4ouoz7OoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lgrb6D6CSf7xC97CxtfCzHEpo4yQbPFJ59WYm47+0gL58RzjcVRd89gsCFMTEsYJR /jt7Yj+qL0m5JGg2zv7ZAbilpc3AJFiHatagUhqrC/QsGX2HoPCrRMpEgFBNsUDLeS o4TbcZgbCd3zwVg7FeyzO0O2MRpTkF1GNpEK/ySNycTDjjMit4SQY5YjIb5oaiJd/d VrVm9eEEP8kD4jzGYhNGZ/3cY7rsucN5/VNLs0L3gkgG7Ml7nL+/i0TAkuebQ1LiKS hj2gygxD0mw0vsi7l9K9Dm0Sl1s5hFpaxNHfFVg/jeWy2VL/ZL78v2SmBgaEbz1b6u yv/68Vm/TjqBQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] microblaze: adjust the help to the real behavior Date: Fri, 7 Dec 2018 20:33:52 +0900 Message-Id: <1544182437-26660-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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 is not a real Make target. It does not work 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.... simpleImage.
works like a phony target that generates multiple images. Reflect the real behavior. I removed the DT directory path information because it is already explained a few lines below. While I am here, I deleted the redundant *_defconfig explanation. The top-level Makefile caters to list available defconfig files: mmu_defconfig - Build for mmu nommu_defconfig - Build for nommu Signed-off-by: Masahiro Yamada --- Changes in v2: - Show all the four images in help - Delete redundant *_defconfig explanation arch/microblaze/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index ddb251a..f6b7ea6 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -92,11 +92,11 @@ 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 ' *_defconfig - Select default config from arch/microblaze/configs' - echo '' + echo ' simpleImage.
- Create the following images with
.dtb linked in' + echo ' simpleImage.
: raw image' + echo ' simpleImage.
.ub : raw image with U-Boot header' + echo ' simpleImage.
.unstrip: ELF (identical to vmlinux)' + echo ' simpleImage.
.strip : stripped ELF' echo ' Targets with
embed a device tree blob inside the image' echo ' These targets support board with firmware that does not' echo ' support passing a device tree directly. Replace
with the' From patchwork Fri Dec 7 11:33: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: 153144 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp386759ljp; Fri, 7 Dec 2018 03:34:26 -0800 (PST) X-Google-Smtp-Source: AFSGD/VwCgeCEQ5/Iv7hq3n8e1kMEWZqhssSXm+fJ/fWrFUiAUpIHFfFY6jbQjLd1ENOV5DTTdTs X-Received: by 2002:aa7:8497:: with SMTP id u23mr1881247pfn.220.1544182466101; Fri, 07 Dec 2018 03:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182466; cv=none; d=google.com; s=arc-20160816; b=iyp7cer9LfWcZ2KAHE9oBqrOK8fGeUO8RIhltfUwhR9fHorQ00INtxmm0QZfXmpvTe 0hyBVvUN3T5vzKu3Ukn7GVCmqpdfw/TVLYcmqzaGj5o3QWUy35Jq4yd+MHjaeGqn+Aro 5AS3q0rKtyD9oVw+NCQXmLKTQSw0AIVKSORUPM74EKfcvkutQ42NFj+svereGErtoPnA vlPtbWEKzMm37pkhD9IcJKckDpeM6ZMuCxyx/LyfJnpTNrBMlRlBJnEQJAwi04xdFqTX HvSt02oAJnzly5Qs/uDCD4kM/zEvSOsXRcPSBHawbRYCnx6ehiPVMiZTM17UgcJqJqrJ YUEA== 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=SRUaAFRTbwO28yc2CsI2BAuLVo7SHEZKUVtHP5T2BIE=; b=jtsUjEHBk0yexTf8ClVF4fN7d+05c5rMMWF8soBmNFbz/cibkpref60dndQjpz4h9z qGFRgmwoaOmxVhY4Ij3QgWlRbQAbxNJ4ju8ywcb9spqyt9EG/mmPUdOVC0o76Wws0Y8o WiY27UihfxNps2AWgUcytqQOVVTuohGLKZ6X826kpfbf1MpOn2+Zle6AYGyguga3HEwu Z4oPI1h13P1Zb9M4AdnlMrKhD02hXzv+WFxFnoX3r9QT4A9JY5l0KpCabdGgL8GrOMPq WCik8shNyEE9qEhOPAPp80Y1sAPI/YN9N93LpnVZrmu/DlJQ/VAGXPKtcSCF2SQPf5OY kO9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eq5teo3s; 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 t65si2894520pfb.247.2018.12.07.03.34.25; Fri, 07 Dec 2018 03:34:26 -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=eq5teo3s; 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 S1726122AbeLGLeX (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:23 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45510 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725992AbeLGLeW (ORCPT ); Fri, 7 Dec 2018 06:34:22 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6rd020070; Fri, 7 Dec 2018 20:34:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6rd020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182448; bh=SRUaAFRTbwO28yc2CsI2BAuLVo7SHEZKUVtHP5T2BIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eq5teo3sx+N2aGPsTWj929xvw1xWSVGEr2TVus2ZCjWtbCXP68n2R8z9g9XVJWHV1 NPt30dUSLPI6u3z2hiUApwrCS1SB9OiRBfllBvaq7zdULuHk7jSNR69EfUmbnNzuxk v3nJrUwI2EuIDeLph8y22AhfYeFYjmoRHmf46fAfJQSxZXFRiEpnKrU2bQDBVaeE1O z4IYUWc54aEsW+bnv00r6JBJYHZdl0PzKhb0TktnYFfgI1yHcOIU4MFwG8h1LTELef kIQ2ZyTslc33S2zVJTMwcvumcXA8k6osPhspU+7ZRzy+oUjOe4TL+m+SqnteVz5aS6 aCPM2T1FF9FYw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] microblaze: move "... is ready" messages to arch/microblaze/Makefile Date: Fri, 7 Dec 2018 20:33:53 +0900 Message-Id: <1544182437-26660-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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. Signed-off-by: Masahiro Yamada --- Changes in v2: None 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 f6b7ea6..6cee1ca 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -84,9 +84,11 @@ archheaders: 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 600e5a1..96eefdc 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.*.unstrip linux.bin.ub From patchwork Fri Dec 7 11:33: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: 153146 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp386955ljp; Fri, 7 Dec 2018 03:34:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/UUtNe43mNjh/hKqscfhnF5Chj1XKRoqNgw5rPGz/ga4HErIqPBbG+zKwOphRtLWsr54vWN X-Received: by 2002:a17:902:48:: with SMTP id 66mr1772030pla.68.1544182480532; Fri, 07 Dec 2018 03:34:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182480; cv=none; d=google.com; s=arc-20160816; b=qL+Tt5JRQ5t1FSt4NuP8lUwD6Qzp0ZQjoABGdGEmQJPMVSZneAvBNquLhFMRu96L79 mvyi1Ny/LR4poxMnvqzw6TjY3L7ECPiSGFus2/wEXWWF3BVaN2+YuSaltlHO4y1HKR5u CVHOpTTW95Wzh2q8TNQPvD/EAnlEUzoeZCdAjg/SpyVR19qRgnH78AqGcbM2xJY2MmMr av9D9NdEzGGGsTGKkxw3r4j39YNtf/My8s/hiD6gQbTXBfwd3eb2ndZJdSXcHKls8HGf gVI5RCO2FTtagxEzLA/EBtSmi5D7UNGkpsvhv73UtdaHkIsurvTVuUshr05/Ihn7GTdr ZJVw== 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=ivFgaDo0g7XPKa5r9gRej5aUPRGIiJLbRoRae7zdj6w=; b=tL1PbchX290YSIQdOStf5lKLfFFEWbX4Pkdvt5Mvl3C+eeqxseUCWEMvgym1SOLQxT aEpJa1t34rXkVHzrcuEDipGYgXlfrxo2WApw1bdE0EzQ/ws3uWA/BykXZn0LQQKmawAT Gcmcwj3XZS4JpsUYQzkE4IcK7eNQRILno3EN6wdBWglXZN1QU6noE+eVKUGdpCglNJzE 6Vahz7wP0Notn7e8rVsmrOAUvEYGi3L0RFc3uy6fJRamluvhpYwuylkhuG6OJiSwBB4i 6O7M3wIERLca7NAVmAErCjasg6uFSq37xlNGtYdM1TQxiR1+kVHDDs/7WDk55SV9VSwn cLUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JVTi2EUa; 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 q9si2685750pgh.92.2018.12.07.03.34.40; Fri, 07 Dec 2018 03:34:40 -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=JVTi2EUa; 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 S1726169AbeLGLei (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:38 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45833 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726140AbeLGLeg (ORCPT ); Fri, 7 Dec 2018 06:34:36 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6re020070; Fri, 7 Dec 2018 20:34:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6re020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182448; bh=ivFgaDo0g7XPKa5r9gRej5aUPRGIiJLbRoRae7zdj6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JVTi2EUa+qQue5dSdxR0r6bNknXhq2MlEsinLwfDvJ72mot/DsKSAbEO14SxiH3Lx ADkhrCV0faPuAZNywAsznOP1vdIZwXLA+ku51bM4iXhAx6zBu2RosaQH5X7ZaFxI2e H3gMjpPQSjLjgQFFZAnctl5iTCcygCnkTpCnKa4oAzL9PZRAT/4CXoy/As2yGkfbUd PohOr0x3UoiSeJBIwxMNFGmNhMEYgv+PE/ZJ9A5C5Mlskwe8hmLWw2PoA+aMYXnWCx AM+oNObRrgCrbq8idw8p5wiKs+w4tplIgwOdZsZ8vvGsjSOYqmJ5m9k6/7bvg3aAL5 Q/1jFzEe5x4Lg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] microblaze: fix multiple bugs in arch/microblaze/boot/Makefile Date: Fri, 7 Dec 2018 20:33:54 +0900 Message-Id: <1544182437-26660-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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 commit fixes some build issues. 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} 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 confusing. Let's split the build recipe for each image. simpleImage.
*.unstrip is just a copy of vmlinux. simpleImage.
and simpleImage.
.ub are created in the same way as linux.bin and linux.bin.ub, respectively. I kept simpleImage.* recipes independent of linux.bin.* ones to not change the behavior. Lastly, this commit fixes "make ARCH=microblaze clean". Previously, it only cleaned up the unstrip image. Now, all the simpleImage files are cleaned. Signed-off-by: Masahiro Yamada --- Changes in v2: - Squash the first patch into this - Separate simpleImage recipes from linux.bin* recipes arch/microblaze/Makefile | 2 +- arch/microblaze/boot/Makefile | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 6cee1ca..ff5abbd 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -87,7 +87,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) $(addprefix $(boot)/$@., ub unstrip strip) @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 96eefdc..cff570a 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.* OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary @@ -16,21 +16,20 @@ $(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) +$(obj)/simpleImage.$(DTB): vmlinux FORCE $(call if_changed,objcopy) + +$(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE $(call if_changed,uimage) - $(call if_changed,strip,.strip) -clean-files += simpleImage.*.unstrip linux.bin.ub +$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE + $(call if_changed,shipped) + +$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE + $(call if_changed,strip) From patchwork Fri Dec 7 11:33: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: 153149 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp387127ljp; Fri, 7 Dec 2018 03:34:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/VqWQ4QhoGogDXJM0y3vFrxzwNJWvMTmElptCzap9F8lL1eBq64+Dd76xN1mModyZ0iCDL/ X-Received: by 2002:a63:1321:: with SMTP id i33mr1659450pgl.380.1544182493486; Fri, 07 Dec 2018 03:34:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182493; cv=none; d=google.com; s=arc-20160816; b=kOPJxpF9fcsjJNe30YmkPi7Bqv3m2Iyp0fKngrLC8uZanSeqGxwholcvDo6fSTqU0t l+ipuCSa5KRUp1c4aPo8/QdODi1jh3bsd42UYGIqDDmhEomq5YvL3BQJJnWaTTBGjNKf hrFylqLQfMBJLxtsiPymmXWvt1uo39kRqhUQZBbMwRaOCXjTIpbiEMZj+/GDKq3nbpH6 NSHEIZdCQ1SvLKoNZHSux2jNUM68+t0tMS1KtOx4GSFqS/Cm/cj2BgmBDLiLMVA6RscR wrWy+TPWMnHPIJAbsvt4uLAAjbRuaeaMM2gctqWyj62HRvnDZjli+1N/O+KhkKa7vNvs jnHg== 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=Szx3G+D9Ykc5wPocxiIgpOefJMSBr6XaryNtZw8+QQQ=; b=ExQ9NSLVfEuHDmdDc5BTVIwf6X6I52MHexiLoETGJphWxGA+IJxnkVwIDMANqeEyjo iece9L8MP5vvIGIwLIhDCiPDDTNEOGMfF1MrKy4z5WPZHpPHdf0FT7fMakxzPzxgXnvV WhLORhSsxABcKYTbzamIZW+GJ0VeWM6uBjm5Ash9yYLNhBSGMW3nhURyNm/ulJyrvrrF FF7A2rTBcUKftBtuxHgumVptEf+8Cr80B+rm+wP5+cEvj8Y23mNVNKf79nOrV4UIj34m w7gnVEKcEyX/S88mSBz1EA30aMPY+ZWTNYeHKgcU5zuqj07lf7VaNN1qGPZw12Vu1C3y seqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=GB6nkJcx; 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 i35si2710309plg.396.2018.12.07.03.34.53; Fri, 07 Dec 2018 03:34:53 -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=GB6nkJcx; 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 S1726192AbeLGLev (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:51 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45837 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbeLGLeg (ORCPT ); Fri, 7 Dec 2018 06:34:36 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6rf020070; Fri, 7 Dec 2018 20:34:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6rf020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182449; bh=Szx3G+D9Ykc5wPocxiIgpOefJMSBr6XaryNtZw8+QQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GB6nkJcx+bKVbVtbEiXhg7Q1FTdzhiVCCRyVG9ph8DQTwA30gQ1vMKu5WKLl9kw4r qiXDSsKa8mSRwVyZZsSe5nzct++yyKU81jvS4EzMB2HqkBRS49pOhFd+fx6/pD3CPg 5CW2AMOgQB7cwlrJjtQzna5tgjF3uI7H2foAPtYqtE5R4HXV3tQgrrgNII+7jXQkAe /ZsuaRJc1mXAPO+aShCCGUIfi1SF0PowH8IFGnrssa8sUpVzt0SJ8SiP4+rLz5hvnH nJOZbNRtYlJCzo+jClDg3HGHA9QDzJzWXiJeQjaF3NX1EpBnKb6GZn4wxOKC710YBS 4J+PqW3A8jTpg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] microblaze: add linux.bin* and simpleImage.* to PHONY Date: Fri, 7 Dec 2018 20:33:55 +0900 Message-Id: <1544182437-26660-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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 replaced it with equivalent simpleImage.$(DTB). Signed-off-by: Masahiro Yamada --- Changes in v2: None 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 ff5abbd..180dffa 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -82,11 +82,13 @@ archclean: archheaders: $(Q)$(MAKE) $(build)=arch/microblaze/kernel/syscalls all +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) $(addprefix $(boot)/$@., ub unstrip strip) @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' From patchwork Fri Dec 7 11:33: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: 153147 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp386996ljp; Fri, 7 Dec 2018 03:34:43 -0800 (PST) X-Google-Smtp-Source: AFSGD/XCwIq6SEpugpfqU/hNFB17mxMshmVX6dDezhQM+vvwmaE41VzOSOP1QzyDUsckTFWKhAFe X-Received: by 2002:a63:83c1:: with SMTP id h184mr1581172pge.437.1544182483555; Fri, 07 Dec 2018 03:34:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182483; cv=none; d=google.com; s=arc-20160816; b=QnjKfAnNqKNEE5S8hqCSXURMgo7BLqqTjV26gzbTXNL6aGFwte3ut1BEGV1XtI3s8n hGG+KLWPZ6u+4p0yaq/QPOWVvrgDcIQd5yPpkRbAzcffKDFI2/V5kB49evomqvnI0bFO ijGxOfZXkWIbyW4CSv1op8hdOr5upnyG1GLeuLbIJFTuXN7eINDi9hxmZcpynhgX916u IPiLKcEy5rT3K7YWiIl/aL3/NXVfhcD7PSB35MMur03UiNwL1CcdOc4LwrCe/iZUwfR2 TTrMZmoAOoHufxSNgt8MlAwBmFktxg+rCRSi40nNAMM9b3tsgBOakY+etH06I1Tr3H6A LXCQ== 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=iWKyb7H5Y6sa+fS3ZVKUj+AUMRvSCVfD4O07yhmAYiw=; b=dkEYeIEgMM4OpnJVK+n+fA/N8kUWfonZFy2NE8i5csVGkRtiCwYx4tV6BfpMPweXtl iHyssPEMVZnxeBf8fKohkQiGL43nPiQ7Hp2ZZKM3N5pWOzIIXvjm4JjjYOiOdT7pX/oF D9kvcNpZ0i9IEWoPN7OWzqdG1NK7ZFx4sT/K6YUOX7e+Jr6+aB+i2WaVfNh2rmi+kZ2N wPe8lowcgLetk6z1O4qpLW7Gmd3/97nu0JSB9GoKqvF1DmvHEQOr+XwIkXVGiTj9C9nV NG+ErOmUsvCAJ69O33kbNIbNiBHSRsZGsfxyQ4dclMRtb1CTO6NyZelgl6/a/HP2k22T uTpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=bqdWSyR4; 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 q9si2685750pgh.92.2018.12.07.03.34.43; Fri, 07 Dec 2018 03:34: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=bqdWSyR4; 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 S1726155AbeLGLeh (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:37 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45839 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726141AbeLGLef (ORCPT ); Fri, 7 Dec 2018 06:34:35 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6rg020070; Fri, 7 Dec 2018 20:34:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6rg020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182449; bh=iWKyb7H5Y6sa+fS3ZVKUj+AUMRvSCVfD4O07yhmAYiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bqdWSyR4ct/WJ+ehuhU+WAJQkwtK44msPUli7SjFA8ROLf/az93c6UktZdCt0ZXMY 0Nl+x+PLiyTuT8VMfKfcvDBfqp9+zAYiRDSlhDS6T9wMWlv+EFBFTkGKn1RANPLJRC 9xg1Ov4LGkhWBzoXVyinLT9Kz9zsQ+WpJolntiRkpr2MXaL9zldQ5oX02lS/iXvEW+ EMVdRIzrJIoMO+9iFeE4Jx2YVesCddmJsJmj5iVRPn2KEGTWJd6Tyb2LHM/d0HN0Ua O6jI2s610G3XOnWZancW8nJtwJjpogOZhV1YwWDsVxvdj4q2poEDeprJbiEntOY4RU 8JHvwvR8fzIBA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] microblaze: fix race condition in building boot images Date: Fri, 7 Dec 2018 20:33:56 +0900 Message-Id: <1544182437-26660-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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 because two threads descend into arch/microblaze/boot simultaneously. Add proper dependencies to avoid it. Signed-off-by: Masahiro Yamada --- Changes in v2: None 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 180dffa..7b340a3 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -83,7 +83,9 @@ archheaders: $(Q)$(MAKE) $(build)=arch/microblaze/kernel/syscalls all PHONY += linux.bin linux.bin.gz linux.bin.ub -linux.bin linux.bin.gz linux.bin.ub: vmlinux +linux.bin.ub linux.bin.gz: linux.bin +linux.bin: vmlinux +linux.bin linux.bin.gz linux.bin.ub: $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' From patchwork Fri Dec 7 11:33: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: 153148 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp387032ljp; Fri, 7 Dec 2018 03:34:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/X9XMW/jmaSbCb2w+GkFtZOuc2h1tZYty7RUhWR5tn/yazmOB6SKYxyooGHurzWxcStyHlT X-Received: by 2002:a62:4181:: with SMTP id g1mr1877955pfd.45.1544182485894; Fri, 07 Dec 2018 03:34:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544182485; cv=none; d=google.com; s=arc-20160816; b=mHt4Ou4ZGPMrWX4+Q+/FCgwGam61KKtAWhk2bKwa4FUE1fYUzczQjaYcDWxGjpnQ89 a/MfjLRAGPW73b+4hIn6fdIVYWh77YI6RSA+9tBKVVe8QShS3FF34kudMYNoLeiVViNf 7mAGbHNzMe1QmpKQAUuXSku3j00PUWQH7vjBMh+nIVJT7jfBwTZfrE6qiLFGrrwmqJEn tiqIvN9PzAINlMAtSZl1ov9+TB9cLCI0HF+wNJCE4/VyPCq48jUJUeY6uExhHOlsmK24 4qvdWhaX+wXFhxZwoXNp6t65jcm5O7sIE2jTkvUQuonAvfW04NW8cYtS0jcJRPzwqkqK b0WA== 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=KCjsuzrFx2wg6Gb74nuWaE7EsmARAPFNbSOugl+oRTg=; b=SCIa0ZHne2Db/wFDnECGis9BCNzuz244lPoz+0HjcksUYYHjiHVWTq9hmVEPIfIx6s o9o6u9nfH2twpzO2gwWMMpjJ3SPg2cN+5cvREu9jKX2N5sL4hvBDu/LjMkfl4tGKzEnY nmdK94+uvsNGJt1tZcYjD/prnFxg6oLSShFENyCkQHK/f7zU5qWH1t+KWlUBF0MdtlcF p2Rm7cn812ruSjBm4rcTkq2+F7EkYZ8iYicNRC4+qtlRxIA4JAwIg6DOgx7ylfDeitJY cf98Q1iKiti6UeYqgpXksqjHGvxIcrwVzK8niRTFrzQNlguYshK6VEWRmT6IM+bJ9z82 ApLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=pfPV1Ut1; 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 g34si2799850pld.15.2018.12.07.03.34.45; Fri, 07 Dec 2018 03:34: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=pfPV1Ut1; 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 S1726181AbeLGLen (ORCPT + 31 others); Fri, 7 Dec 2018 06:34:43 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:45963 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726085AbeLGLem (ORCPT ); Fri, 7 Dec 2018 06:34:42 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id wB7BY6rh020070; Fri, 7 Dec 2018 20:34:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wB7BY6rh020070 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544182450; bh=KCjsuzrFx2wg6Gb74nuWaE7EsmARAPFNbSOugl+oRTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pfPV1Ut1bR4IXnGwf+6EIt1LbiqTyb5LbVKnf7+K0eZUCgtoMPjQCO6mOLX4T2QV7 7k6JZOcwwnaURvchhtm3B9KDlnSLh72JME1xtEAN3A0Cz5PbsuK1YNfV4FDhQwf2UR KzvteyUmcvxIF8101kmv53rJyPU1MTK6XmZHhU1VuF3i3gJzVl/fm9o/DbI3qoBcEe ULSqWRdHwbneq2BBbsIS7ICIXjTocnCt0pBVazajm5PAja4lbJuI9HGeaxGHgyqv4c Mzx18+rMIP0H50ieZiY3vzF8mekSZNPM6DFIWMe3RnjGR0hByvWQwNG0doajVJPFYp ijWK7318OezPQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Michal Simek Cc: Masahiro Yamada , devicetree@vger.kernel.org, Mark Rutland , Rob Herring , linux-kernel@vger.kernel.org Subject: [PATCH 6/6] microblaze: remove the explicit removal of system.dtb Date: Fri, 7 Dec 2018 20:33:57 +0900 Message-Id: <1544182437-26660-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com> References: <1544182437-26660-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) In fact, no Makefile needs to delete a target explicitly on error. It is automatically done since commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"). I also reused equivalent cmd_shipped from scripts/Makefile.lib. Signed-off-by: Masahiro Yamada --- Changes in v2: None 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