diff options
| author | Frank Rowand <frank.rowand@sony.com> | 2019-01-17 14:01:14 -0800 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2019-02-28 11:40:48 -0600 |
| commit | 87143fce31240242d97f2c3cb1b61601a38bf7ea (patch) | |
| tree | 9062e4e879136a08aaef86690ad08d9878dfcc70 | |
| parent | 89716dc353bdf1ab34c3a41d3f157ce28b4fbe7d (diff) | |
| download | linux-stable-87143fce31240242d97f2c3cb1b61601a38bf7ea.tar.gz linux-stable-87143fce31240242d97f2c3cb1b61601a38bf7ea.tar.bz2 linux-stable-87143fce31240242d97f2c3cb1b61601a38bf7ea.zip | |
of: add dtc annotations functionality to dtx_diff
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>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rwxr-xr-x | scripts/dtc/dtx_diff | 13 |
1 files changed, 12 insertions, 1 deletions
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 |