diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-12-07 12:33:57 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-12-14 08:09:21 +0100 |
| commit | 19d111ccce9f4c3e0820585d991bf5ae9172cbe3 (patch) | |
| tree | 177583866a27207c7cd5b3989bcc38e39b0dbcbc /arch/microblaze | |
| parent | microblaze: fix race condition in building boot images (diff) | |
| download | linux-19d111ccce9f4c3e0820585d991bf5ae9172cbe3.tar.xz linux-19d111ccce9f4c3e0820585d991bf5ae9172cbe3.zip | |
microblaze: remove the explicit removal of system.dtb
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>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/boot/dts/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile index c7324e74f9ef..ef00dd30d19a 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 |