summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-05 11:05:50 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-05 11:05:50 +0200
commitd27b97820cffe2607ef5057df7897ce9aaee9099 (patch)
treeb2bf8c035ba87729152a2d101ab599fa9716b298 /scripts
parentc61ba238f70e273aa46317fcc455c823f0e4e761 (diff)
parent6bef4dd5953377d6e25bb1a57f8e2a91ce5ecca0 (diff)
downloadbarebox-d27b97820cffe2607ef5057df7897ce9aaee9099.tar.gz
barebox-d27b97820cffe2607ef5057df7897ce9aaee9099.tar.xz
Merge branch 'for-next/dts'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cf7e2d54f7..d4306cbe78 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -146,8 +146,9 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)
ld_flags = $(LDFLAGS) $(EXTRA_LDFLAGS)
dtc_cpp_flags = -Wp,-MD,$(depfile).pre -nostdinc \
- -I$(srctree)/arch/$(SRCARCH)/dts \
- -I$(srctree)/arch/$(SRCARCH)/dts/include \
+ -I$(srctree)/arch/$(SRCARCH)/dts/include \
+ -I$(srctree)/dts/include \
+ -I$(srctree)/dts/src/ \
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into
@@ -222,6 +223,7 @@ quiet_cmd_dtc = DTC $@
cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
-i $(srctree)/arch/$(SRCARCH)/dts $(DTC_FLAGS) \
+ -i $(srctree)/dts/src/$(SRCARCH) \
-d $(depfile).dtc $(dtc-tmp) ; \
cat $(depfile).pre $(depfile).dtc > $(depfile)