Skip to contentSkip to conversation

scripts/dtc: dtx_diff - add info to error message

PATCH In review Frank Rowand 2 participants 4 messages Feb 2, 2016 – Feb 12, 2016 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/dtc: dtx_diff - add info to error message

From: Frank Rowand <[email protected]>

If kernel config options are not properly set, "make scripts" will not compile dtc. Update the unable to find dtc error message to check the kernel config and give better advice on how to create dtc.

Reword another error message to increase clarity.

---
 scripts/dtc/dtx_diff |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
scripts/dtc/dtx_diff +10 -4
Index: b/scripts/dtc/dtx_diff
===================================================================
@@ -136,8 +136,7 @@ compile_to_dts() {
 			echo ""                                              >&2
 			echo "  architecture ${dtx_arch} is in file path,"   >&2
 			echo "  but does not match shell variable \$ARCH"    >&2
-			echo "  (${ARCH}) does not match shell variable"     >&2
-			echo "  \$ARCH (${ARCH})"                            >&2
+			echo "  >>\$ARCH<< is: >>${ARCH}<<"                  >&2
 		fi
 
 		if [ ! -d ${srctree}/arch/${ARCH} ] ; then
@@ -267,6 +266,14 @@ DTC="${__KBUILD_OUTPUT}/scripts/dtc/dtc"
 
 if [ ! -x ${DTC} ] ; then
 	__DTC="dtc"
+	if grep -q "^CONFIG_DTC=y" ${__KBUILD_OUTPUT}/.config ; then
+		make_command='
+         make scripts'
+	else
+		make_command='
+         Enable CONFIG_DTC in the kernel configuration
+         make scripts'
+	fi
 	if ( ! which ${__DTC} >/dev/null ) ; then
 
 		# use spaces instead of tabs in the error message
@@ -280,8 +287,7 @@ ERROR: unable to find a 'dtc' program
       'dtc' is: ${DTC}
 
       If it does not exist, create it from the root of the Linux source tree:
-
-         'make scripts'.
+${make_command}
 
       If not at the root of the Linux kernel source tree -s SRCTREE or -S
       may need to be specified to find 'dtc'.
#1 lore raw
Quoted 9 lines · Frank Rowand

From: Frank Rowand <frank.rowand-/[email protected]>

If kernel config options are not properly set, "make scripts" will not compile dtc. Update the unable to find dtc error message to check the kernel config and give better advice on how to create dtc.

Reword another error message to increase clarity.

< snip >

Ping, no reply on original email.

In the thread about the of ir msi-map patch you mentioned that you have nothing else queued for 4.5. Is dtx_diff (and hopefully this patch) queued up for 4.6? If so, could they instead go into 4.5 since they are support tools, and do not directly impact the kernel?

Thanks,

Frank

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 7 lines · Frank Rowand
Quoted 6 lines · Frank Rowand

From: Frank Rowand <[email protected]>

If kernel config options are not properly set, "make scripts" will not compile dtc. Update the unable to find dtc error message to check the kernel config and give better advice on how to create dtc.

Quoted 7 lines
Quoted 3 lines

Reword another error message to increase clarity.

< snip >

Ping, no reply on original email.

No comment, no reply. I only reply with "applied" when I actually apply stuff which tends to be at least several weeks. Otherwise, I might tell you applied and then miss it. :)

Anyway, now applied.

Quoted 4 lines

In the thread about the of ir msi-map patch you mentioned that you have nothing else queued for 4.5. Is dtx_diff (and hopefully this patch) queued up for 4.6? If so, could they instead go into 4.5 since they are support tools, and do not directly impact the kernel?

It's not a fix either though, so no, it's queued for 4.6 and has been since -rc1.

Rob

#3 lore raw
Quoted 27 lines · Rob Herring
Quoted 7 lines · Frank Rowand
Quoted 6 lines · Frank Rowand

From: Frank Rowand <frank.rowand-/[email protected]>

If kernel config options are not properly set, "make scripts" will not compile dtc. Update the unable to find dtc error message to check the kernel config and give better advice on how to create dtc.

Quoted 7 lines
Quoted 3 lines

Reword another error message to increase clarity.

< snip >

Ping, no reply on original email.

No comment, no reply. I only reply with "applied" when I actually apply stuff which tends to be at least several weeks. Otherwise, I might tell you applied and then miss it. :)

Anyway, now applied.

Quoted 4 lines

In the thread about the of ir msi-map patch you mentioned that you have nothing else queued for 4.5. Is dtx_diff (and hopefully this patch) queued up for 4.6? If so, could they instead go into 4.5 since they are support tools, and do not directly impact the kernel?

Quoted 5 lines

It's not a fix either though, so no, it's queued for 4.6 and has been since -rc1.

Rob

Ok, thanks!

-Frank
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html