summaryrefslogtreecommitdiff
path: root/dts/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-25 10:39:58 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-25 10:39:58 +0200
commited1d98d801dfb6384d0f2fff45ce1ebf884944ca (patch)
tree5a9487c67b75606d3a723b7acb9eda8da200c871 /dts/Makefile
parent754466ac95e92ebf40e25c6af6f13ab9b4d7c87b (diff)
parentba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab (diff)
downloadu-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.zip
u-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.gz
u-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.bz2
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'dts/Makefile')
-rw-r--r--dts/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/dts/Makefile b/dts/Makefile
index e59550c..d3122aa 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -12,13 +12,14 @@ ifeq ($(DEVICE_TREE),)
DEVICE_TREE := unset
endif
+ifneq ($(EXT_DTB),)
+DTB := $(EXT_DTB)
+else
DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
-
-quiet_cmd_copy = COPY $@
- cmd_copy = cp $< $@
+endif
$(obj)/dt.dtb: $(DTB) FORCE
- $(call if_changed,copy)
+ $(call if_changed,shipped)
targets += dt.dtb