dts/Makefile: Build the user specified dts

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

diff --git a/dts/Makefile b/dts/Makefile
index 8b13b23..03e163e 100644 (file)
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -27,16 +27,21 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)libdts.o
 
+ifeq ($(DEVICE_TREE),)
 $(if $(CONFIG_DEFAULT_DEVICE_TREE),,\
 $(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file))
 DEVICE_TREE = $(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE))
+endif
 
 $(if $(CONFIG_ARCH_DEVICE_TREE),,\
 $(error Your architecture does not have device tree support enabled. \
 Please define CONFIG_ARCH_DEVICE_TREE))
 
 # We preprocess the device tree file provide a useful define
-DTS_CPPFLAGS := -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\"
+DTS_CPPFLAGS := -x assembler-with-cpp \
+               -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
+               -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" \
+               -I$(SRCTREE)/board/$(VENDOR)/dts -I$(SRCTREE)/arch/$(ARCH)/dts
 
 all:   $(obj).depend $(LIB)
 
@@ -46,9 +51,13 @@ all: $(obj).depend $(LIB)
 DT_BIN := $(obj)dt.dtb
 
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
-       cat $< | $(CPP) -P $(DTS_CPPFLAGS) - >$@.tmp
-       $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} $@.tmp
-       rm $@.tmp
+       rc=$$( \
+               cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
+               { { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
+                   echo $$? >&3 ; } | \
+                 grep -v '^DTC: dts->dtb  on file' ; \
+               } 3>&1 1>&2 ) ; \
+       exit $$rc
 
 process_lds = \
        $(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p'
@@ -62,8 +71,9 @@ $(obj)dt.o: $(DT_BIN)
        # We look in the LDSCRIPT first.
        # Then try the linker which should give us the answer.
        # Then check it worked.
-       oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` ;\
-       oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
+       [ -n "$(LDSCRIPT)" ] && \
+               oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` && \
+               oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
        \
        [ -z $${oformat} ] && \
                oformat=`$(call process_lds,$(GET_LDS),FORMAT)` ;\