Commit 87143fce authored by Frank Rowand's avatar Frank Rowand Committed by Rob Herring
Browse files

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: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 89716dc3

scripts/dtc/dtx_diff

+12 −1
Original line number Diff line number Diff line
@@ -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