X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dts%2FMakefile;h=6f36153634b5cb082975d0912d6bbd1256a0f6d8;hb=38797bcb1f8306429409ca2831309342b77a2e37;hp=055b8ac599ad1355f049f58265b57d4709005600;hpb=948fa1713cce09dd958bda41eb5c97015a217f91;p=oweals%2Fu-boot.git

diff --git a/dts/Makefile b/dts/Makefile
index 055b8ac599..6f36153634 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -36,8 +36,10 @@ $(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\" \
-		-DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"
+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)
 
@@ -67,8 +69,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)` ;\