mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15
@ 2014-06-10 11:55 Bernhard Walle
  2014-06-11  6:30 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bernhard Walle @ 2014-06-10 11:55 UTC (permalink / raw)
  To: ptxdist; +Cc: Bernhard Walle

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>
---
 rules/dtc.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/dtc.make b/rules/dtc.make
index 55086d1..da36971 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 \
-- 
2.0.0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15
  2014-06-10 11:55 [ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15 Bernhard Walle
@ 2014-06-11  6:30 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2014-06-11  6:30 UTC (permalink / raw)
  To: ptxdist

On Tue, Jun 10, 2014 at 01:55:08PM +0200, Bernhard Walle wrote:
> 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>

Thanks, applied.

Michael

> ---
>  rules/dtc.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/dtc.make b/rules/dtc.make
> index 55086d1..da36971 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 \
> -- 
> 2.0.0
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-06-11  6:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-10 11:55 [ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15 Bernhard Walle
2014-06-11  6:30 ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox