From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Michal Simek <monstr@monstr.eu>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
devicetree@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
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 [thread overview]
Message-ID: <1544182437-26660-7-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1544182437-26660-1-git-send-email-yamada.masahiro@socionext.com>
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 <yamada.masahiro@socionext.com>
---
Changes in v2: None
arch/microblaze/boot/dts/Makefile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
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
--
2.7.4
next prev parent reply other threads:[~2018-12-07 11:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 11:33 [PATCH 0/6] microblaze: fix various problems in building boot images Masahiro Yamada
2018-12-07 11:33 ` [PATCH 1/6] microblaze: adjust the help to the real behavior Masahiro Yamada
2018-12-07 11:33 ` [PATCH 2/6] microblaze: move "... is ready" messages to arch/microblaze/Makefile Masahiro Yamada
2018-12-07 11:33 ` [PATCH 3/6] microblaze: fix multiple bugs in arch/microblaze/boot/Makefile Masahiro Yamada
2018-12-07 11:33 ` [PATCH 4/6] microblaze: add linux.bin* and simpleImage.* to PHONY Masahiro Yamada
2018-12-07 11:33 ` [PATCH 5/6] microblaze: fix race condition in building boot images Masahiro Yamada
2018-12-07 11:33 ` Masahiro Yamada [this message]
2018-12-14 7:10 ` [PATCH 0/6] microblaze: fix various problems " Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544182437-26660-7-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=monstr@monstr.eu \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).