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

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

[Frank Rowand]

From: Frank Rowand <frank.rowand@sonymobile.com>

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.

Signed-off-by: Frank Rowand <frank.rowand@sonymobile.com>
---
 scripts/dtc/dtx_diff |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Index: b/scripts/dtc/dtx_diff
===================================================================
--- a/scripts/dtc/dtx_diff
+++ 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'.

Re: [PATCH] scripts/dtc: dtx_diff - add info to error message

[Frank Rowand]

On 2/2/2016 11:02 AM, Frank Rowand wrote:
> From: Frank Rowand <frank.rowand-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>
> 
> 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.
> 
> Signed-off-by: Frank Rowand <frank.rowand-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>

< 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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: dtx_diff - add info to error message

[Rob Herring]

On Thu, Feb 11, 2016 at 6:50 PM, Frank Rowand <frowand.list@gmail.com> wrote:
> On 2/2/2016 11:02 AM, Frank Rowand wrote:
>> From: Frank Rowand <frank.rowand@sonymobile.com>
>>
>> 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.
>>
>> Signed-off-by: Frank Rowand <frank.rowand@sonymobile.com>
>
> < 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.

> 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

Re: [PATCH] scripts/dtc: dtx_diff - add info to error message

[Frank Rowand]

On 2/11/2016 5:41 PM, Rob Herring wrote:
> On Thu, Feb 11, 2016 at 6:50 PM, Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On 2/2/2016 11:02 AM, Frank Rowand wrote:
>>> From: Frank Rowand <frank.rowand-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>
>>>
>>> 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.
>>>
>>> Signed-off-by: Frank Rowand <frank.rowand-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>
>>
>> < 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.
> 
>> 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
> 

Ok, thanks!

-Frank
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html