diff options
| author | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
| commit | 4355151de47c2b4bc72c026ee743bd9ed7f71ba3 (patch) | |
| tree | 159451d359e3154734e1fb3205556f1c421f878e /arch/microblaze | |
| parent | 5d5a0ab1a7918fce5ca5c0fb1871a3e2000f85de (diff) | |
| parent | 92f687f40ee511e0ea6046bf63ceb48ff3ad1494 (diff) | |
| download | linux-4355151de47c2b4bc72c026ee743bd9ed7f71ba3.tar.bz2 | |
Merge branch 'all-dtbs' into dt/next
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/Makefile | 4 | ||||
| -rw-r--r-- | arch/microblaze/boot/dts/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 4f3ab5707265..0823d291fbeb 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -65,9 +65,7 @@ boot := arch/microblaze/boot # Are we making a simpleImage.<boardname> target? If so, crack out the boardname DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS))) -ifneq ($(DTB),) - core-y += $(boot)/dts/ -endif +core-y += $(boot)/dts/ # defines filename extension depending memory management type ifeq ($(CONFIG_MMU),) diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile index 1f77913d404d..c7324e74f9ef 100644 --- a/arch/microblaze/boot/dts/Makefile +++ b/arch/microblaze/boot/dts/Makefile @@ -1,6 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 # +dtb-y := system.dtb + +ifneq ($(DTB),) obj-y += linked_dtb.o # Ensure system.dtb exists @@ -11,6 +14,7 @@ ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtb $(call if_changed,cp) endif +endif quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) |