Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / dts / Makefile

diff --git a/dts/Makefile b/dts/Makefile
index a7a604303cc63ae836b8c4c16635514c24e6c3ef..a20930eb9a5e656bbdedf924e4f754c7da7552e4 100644 (file)
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -10,28 +10,26 @@ ifeq ($(DEVICE_TREE),)
 DEVICE_TREE := unset
 endif
 
-ARCH_PATH := arch/$(ARCH)/dts
-dtb_depends := arch-dtbs
-
 ifneq ($(EXT_DTB),)
 DTB := $(EXT_DTB)
 else
-DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
-dtb_depends += $(DTB:.dtb=.dts)
+DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
 endif
 
 $(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
        $(call if_changed,fdtgrep)
 
+ifeq ($(CONFIG_OF_DTB_PROPS_REMOVE),y)
+$(obj)/dt.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+       $(call if_changed,fdt_rm_props)
+else
 $(obj)/dt.dtb: $(DTB) FORCE
        $(call if_changed,shipped)
+endif
 
 targets += dt.dtb dt-spl.dtb
 
-$(DTB): $(dtb_depends)
-ifeq ($(EXT_DTB),)
-       $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
-endif
+$(DTB): arch-dtbs
        $(Q)test -e $@ || (                                             \
        echo >&2;                                                       \
        echo >&2 "Device Tree Source is not correctly specified.";      \
@@ -40,8 +38,9 @@ endif
        echo >&2;                                                       \
        /bin/false)
 
+PHONY += arch-dtbs
 arch-dtbs:
-       $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
+       $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs
 
 ifeq ($(CONFIG_SPL_BUILD),y)
 obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o