diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2014-06-10 13:55:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-10 20:16:56 +0200 |
| commit | 6ce7b4ff37df46dc96489bf4a5a7f88e8adcacb4 (patch) | |
| tree | 9ffadb3381c583c1986924ac48c6432c5fd35401 /rules/dtc.make | |
| parent | 3ef0db0a26bf43d0020df2940d45283903a4b3cc (diff) | |
| download | ptxdist-6ce7b4ff37df46dc96489bf4a5a7f88e8adcacb4.tar.gz ptxdist-6ce7b4ff37df46dc96489bf4a5a7f88e8adcacb4.tar.xz | |
dtc: Fix image creation with kernel dtc from 3.15ptxdist-2014.06.0
Starting with kernel 3.15, the help output of dtc has changed from
| Force - try to produce output even if the input tree has errors
| -i
| Add a path to search for include files
to
| Try to produce output even if the input tree has errors
| -i, --include <arg>
| Add a path to search for include files
The new regular expression expresses this change and also works with older
kernel versions.
Without that change, the image creation of my kernel fails with following
error message:
| FATAL ERROR: Couldn't open "skeleton.dtsi": No such file or directory
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dtc.make')
| -rw-r--r-- | rules/dtc.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/dtc.make b/rules/dtc.make index 55086d1db..da3697160 100644 --- a/rules/dtc.make +++ b/rules/dtc.make @@ -47,7 +47,7 @@ ptx/dtb = $(notdir $(basename $(strip $(1)))).dtb $< @sed -e 's;^$(TMP_DTS):;$@:;' -e 's;^ \([^ ]*\); $$(wildcard \1);' $(TMP_DEPS) > $(DEPS) @echo DTC `ptxd_print_path "$@"` - @if $(PTXCONF_SYSROOT_HOST)/bin/dtc -h 2>&1 | grep -q "^[[:space:]]-i$$"; then \ + @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 \ |