aboutsummaryrefslogtreecommitdiff
path: root/dts
diff options
context:
space:
mode:
authorHorst Kronstorfer <hkronsto@frequentis.com>2012-07-12 02:58:32 +0000
committerWolfgang Denk <wd@denx.de>2012-08-10 23:45:57 +0200
commita4ff471970e8f749dc16643ee7e354a3fcfa2ad7 (patch)
tree8812d3e19e1bad54d903870fea3e660356820f22 /dts
parent8b5a02640adf77301f943e8754992c50df004e8a (diff)
downloadu-boot-a4ff471970e8f749dc16643ee7e354a3fcfa2ad7.zip
u-boot-a4ff471970e8f749dc16643ee7e354a3fcfa2ad7.tar.gz
u-boot-a4ff471970e8f749dc16643ee7e354a3fcfa2ad7.tar.bz2
dts/Makefile: Check for empty $(LDSCRIPT)
Make sure that $(LDSCRIPT) is not empty before calling process_lds with 'cat $(LDSCRIPT)' else cat will block waiting for input from stdin. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Diffstat (limited to 'dts')
-rw-r--r--dts/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/dts/Makefile b/dts/Makefile
index 055b8ac..50f9066 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -67,8 +67,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)` ;\