From beec39ece5a5f2d4adebaf42a8b903bef82f5cd0 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sun, 21 Jul 2013 00:44:10 +0200 Subject: dtc: use includes conditionally ...only on dtc which supports it. Signed-off-by: Marc Kleine-Budde (cherry picked from commit 494b44ce1148a6637a825bc59664a41766c411f0) Signed-off-by: Marc Kleine-Budde --- rules/dtc.make | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/dtc.make b/rules/dtc.make index 3b695ef40..fddaac73a 100644 --- a/rules/dtc.make +++ b/rules/dtc.make @@ -38,10 +38,12 @@ ptx/dtb = $(notdir $(basename $(strip $(1)))).dtb -o $<.tmp \ $< @echo DTC `ptxd_print_path "$@"` + @if $(PTXCONF_SYSROOT_HOST)/bin/dtc -h 2>&1 | grep -q "^[[:space:]]-i$$"; then \ + dtc_include="-i $(dir $<) -i $(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts"; \ + fi; \ @$(PTXCONF_SYSROOT_HOST)/bin/dtc \ $(call remove_quotes,$(PTXCONF_DTC_EXTRA_ARGS)) \ - -i $(dir $<) \ - -i $(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts \ + $$dtc_include \ -d $(PTXDIST_TEMPDIR)/dtc.dtc.deps \ -I dts -O dtb -b 0 \ -o "$@" "$<.tmp" -- cgit v1.2.3