| Message ID | 1543233248-8500-1-git-send-email-frowand.list@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | of: add dtc annotations functionality to dtx_diff | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/build-ppc64le | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 43 lines checked |
Hi Rob, I got the cc: list wrong on this patch, please dis-regard. I will resend (with unchanged version) to the correct cc: list. -Frank On 11/26/18 3:54 AM, frowand.list@gmail.com wrote: > From: Frank Rowand <frank.rowand@sony.com> > > Add -T and --annotations command line arguments to dtx_diff. These > arguments will be passed through to dtc. dtc will then add source > location annotations to its output. > > Signed-off-by: Frank Rowand <frank.rowand@sony.com> > --- > > This feature depends upon commit 5667e7ef9a9a ("annotations: add the > annotation functionality") in the dtc git repository. To use the > new flags before the new version of dtc is imported to the linux > kernel, download the dtc repository, compile dtc with the make command, > then add the path of the dtc repository to the shell PATH variable. > > scripts/dtc/dtx_diff | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff > index 8c4fbad2055e..0d8572008729 100755 > --- a/scripts/dtc/dtx_diff > +++ b/scripts/dtc/dtx_diff > @@ -21,6 +21,7 @@ Usage: > diff DTx_1 and DTx_2 > > > + --annotate synonym for -T > -f print full dts in diff (--unified=99999) > -h synonym for --help > -help synonym for --help > @@ -28,6 +29,7 @@ Usage: > -s SRCTREE linux kernel source tree is at path SRCTREE > (default is current directory) > -S linux kernel source tree is at root of current git repo > + -T Annotate output .dts with input source file and line (-T -T for more details) > -u unsorted, do not sort DTx > > > @@ -174,6 +176,7 @@ compile_to_dts() { > > # ----- start of script > > +annotate="" > cmd_diff=0 > diff_flags="-u" > dtx_file_1="" > @@ -208,6 +211,14 @@ while [ $# -gt 0 ] ; do > shift > ;; > > + -T | --annotate ) > + if [ "${annotate}" = "" ] ; then > + annotate="-T" > + elif [ "${annotate}" = "-T" ] ; then > + annotate="-T -T" > + fi > + shift > + ;; > -u ) > dtc_sort="" > shift > @@ -327,7 +338,7 @@ cpp_flags="\ > DTC="\ > ${DTC} \ > -i ${srctree}/scripts/dtc/include-prefixes \ > - -O dts -qq -f ${dtc_sort} -o -" > + -O dts -qq -f ${dtc_sort} ${annotate} -o -" > > > # ----- do the diff or decompile >
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff index 8c4fbad2055e..0d8572008729 100755 --- a/scripts/dtc/dtx_diff +++ b/scripts/dtc/dtx_diff @@ -21,6 +21,7 @@ Usage: diff DTx_1 and DTx_2 + --annotate synonym for -T -f print full dts in diff (--unified=99999) -h synonym for --help -help synonym for --help @@ -28,6 +29,7 @@ Usage: -s SRCTREE linux kernel source tree is at path SRCTREE (default is current directory) -S linux kernel source tree is at root of current git repo + -T Annotate output .dts with input source file and line (-T -T for more details) -u unsorted, do not sort DTx @@ -174,6 +176,7 @@ compile_to_dts() { # ----- start of script +annotate="" cmd_diff=0 diff_flags="-u" dtx_file_1="" @@ -208,6 +211,14 @@ while [ $# -gt 0 ] ; do shift ;; + -T | --annotate ) + if [ "${annotate}" = "" ] ; then + annotate="-T" + elif [ "${annotate}" = "-T" ] ; then + annotate="-T -T" + fi + shift + ;; -u ) dtc_sort="" shift @@ -327,7 +338,7 @@ cpp_flags="\ DTC="\ ${DTC} \ -i ${srctree}/scripts/dtc/include-prefixes \ - -O dts -qq -f ${dtc_sort} -o -" + -O dts -qq -f ${dtc_sort} ${annotate} -o -" # ----- do the diff or decompile