summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2014-12-09 09:22:58 +0000
committerJon Medhurst <tixy@linaro.org>2014-12-09 09:22:58 +0000
commit745b3c3b7353e33d36106e49246ed48823d94c5a (patch)
treea995c8b2815921eb3c0f91f4e0b40a0ffd8d38cb /scripts
parent797e351497f6df81b880bed507994ffa3aca2c37 (diff)
parente3644ae79b2b91575b4ea671de36ee8b7f827ea2 (diff)
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpress64
Conflicts: arch/arm64/boot/dts/Makefile
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 26498d19647f..a9c88ea61a95 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -153,6 +153,7 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
-I$(srctree)/drivers/of/testcase-data \
+ -I$(srctree)/include \
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into