From: Alexander Stein <alexander.stein@systec-electronic.com>
To: ptxdist@pengutronix.de
Cc: Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [ptxdist] [PATCH v2] dtc: Do not inhibit linemarker generation if supported
Date: Mon, 15 Sep 2014 13:51:29 +0200 [thread overview]
Message-ID: <1410781889-7284-1-git-send-email-alexander.stein@systec-electronic.com> (raw)
Without linemarkers the error messages are somehwat useless.
To demonstrate I picked a random .dts file file from the arm tree in
linux sources:
DTC ptx-testprj_arm/platform/images/vf610-twr.dtb
Error: /tmp/testprj/platform/state/vf610-twr.dts.tmp:366.1-5 syntax error
FATAL ERROR: Unable to parse input tree
If linemarkers are inserted the error message clearly states in which file
which line caused the error:
DTC ptx-testprj_arm/platform/images/vf610-twr.dtb
Error: /tmp/testprj/platform/build-target/linux/arch/arm/boot/dts/vf610-twr.dts:13.1-5 syntax error
FATAL ERROR: Unable to parse input tree
The support for #line markers was added in the same release as -i was
added. So add -P only if -i is not supported.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
scripts/lib/ptxd_make_dts_dtc.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_dts_dtc.sh b/scripts/lib/ptxd_make_dts_dtc.sh
index d5e8c59..2b4a2cc 100644
--- a/scripts/lib/ptxd_make_dts_dtc.sh
+++ b/scripts/lib/ptxd_make_dts_dtc.sh
@@ -29,8 +29,12 @@ ptxd_make_dts_dtb() {
if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then
dtc_include="-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts"
tmp_dts="${ptx_state_dir}/$(basename "${dts}").tmp"
+ no_linemarker=""
else
+ # the support for "#line ..." was added in the same relase when -i
+ # was added. So we add -P only if -i is not supported.
tmp_dts="${dts}.tmp"
+ no_linemarker="-P"
fi &&
deps="${ptx_state_dir}/dtc.$(basename "${dts}").deps"
@@ -41,7 +45,7 @@ ptxd_make_dts_dtb() {
-Wp,-MD,${tmp_deps} \
-Wp,-MT,${tmp_dts} \
-nostdinc \
- -P \
+ ${no_linemarker} \
-I$(dirname "${dts}") \
-I${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts \
-I${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts/include \
--
1.8.5.5
--
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2014-09-15 11:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410781889-7284-1-git-send-email-alexander.stein@systec-electronic.com \
--to=alexander.stein@systec-electronic.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox