From 4e4eccae5732fe9f6427f821bd2df35b811234c9 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 12 Feb 2013 15:03:37 -0700
Subject: [PATCH] --- yaml --- r: 350820 b: refs/heads/master c:
 e570d7c15a73f88942885881a84257a65fa44c80 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/scripts/Makefile.lib | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5f6bf997070e..ab0bd3fd4e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80beb27d2f81a1c3c8887e0e0a82d77bb392d28
+refs/heads/master: e570d7c15a73f88942885881a84257a65fa44c80
diff --git a/trunk/scripts/Makefile.lib b/trunk/scripts/Makefile.lib
index 7910229ec665..07125e697d7a 100644
--- a/trunk/scripts/Makefile.lib
+++ b/trunk/scripts/Makefile.lib
@@ -156,6 +156,11 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 
 ld_flags       = $(LDFLAGS) $(ldflags-y)
 
+dtc_cpp_flags  = -Wp,-MD,$(depfile) -nostdinc                            \
+		 -I$(srctree)/arch/$(SRCARCH)/boot/dts                   \
+		 -I$(srctree)/arch/$(SRCARCH)/include/dts                \
+		 -undef -D__DTS__
+
 # Finds the multi-part object the current object will be linked into
 modname-multi = $(sort $(foreach m,$(multi-used),\
 		$(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))
@@ -272,8 +277,7 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts)
 
 quiet_cmd_dtc_cpp = DTC+CPP $@
-cmd_dtc_cpp = $(CPP) $(cpp_flags) -x assembler-with-cpp -undef -D__DTS__  \
-			-o $(dtc-tmp) $< ; \
+cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
 	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp)
 
 $(obj)/%.dtb: $(src)/%.dtsp FORCE