diff mbox series

[U-Boot] arm64: zynqmp: Fix misspelled choice default

Message ID 20180130130201.6291-1-ulfalizer@gmail.com
State Accepted
Commit e7563c204eb4f7a422121c342e4e9f34cd1986e9
Delegated to: Michal Simek
Headers show
Series [U-Boot] arm64: zynqmp: Fix misspelled choice default | expand

Commit Message

Ulf Magnusson Jan. 30, 2018, 1:02 p.m. UTC
There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
probably intended.

No functional changes. Kconfig choices fall back on using the first
(visible) symbol in the choice as the default if the default symbol is
not visible.

Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
which prints the following warning:

	warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice

I've added a corresponding warning to the C tools too, which is
currently in linux-next: https://patchwork.kernel.org/patch/9983667/

Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michal Simek Jan. 30, 2018, 1:25 p.m. UTC | #1
On 30.1.2018 14:02, Ulf Magnusson wrote:
> There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
> probably intended.
> 
> No functional changes. Kconfig choices fall back on using the first
> (visible) symbol in the choice as the default if the default symbol is
> not visible.
> 
> Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
> which prints the following warning:
> 
> 	warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice
> 
> I've added a corresponding warning to the C tools too, which is
> currently in linux-next: https://patchwork.kernel.org/patch/9983667/
> 
> Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
> ---
>  arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
> index 3f922b4097..56b7846f63 100644
> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
> @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
>  choice
>  	prompt "Boot mode"
>  	depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
> -	default JTAG
> +	default JTAG_MODE
>  
>  config JTAG_MODE
>  	bool "JTAG_MODE"
> 

Applied. How to run this tool inside u-boot?

Thanks,
Michal
Ulf Magnusson Jan. 30, 2018, 1:38 p.m. UTC | #2
On Tue, Jan 30, 2018 at 2:25 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 30.1.2018 14:02, Ulf Magnusson wrote:
>> There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
>> probably intended.
>>
>> No functional changes. Kconfig choices fall back on using the first
>> (visible) symbol in the choice as the default if the default symbol is
>> not visible.
>>
>> Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
>> which prints the following warning:
>>
>>       warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice
>>
>> I've added a corresponding warning to the C tools too, which is
>> currently in linux-next: https://patchwork.kernel.org/patch/9983667/
>>
>> Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
>> ---
>>  arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>> index 3f922b4097..56b7846f63 100644
>> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
>> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
>> @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
>>  choice
>>       prompt "Boot mode"
>>       depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
>> -     default JTAG
>> +     default JTAG_MODE
>>
>>  config JTAG_MODE
>>       bool "JTAG_MODE"
>>
>
> Applied. How to run this tool inside u-boot?
>
> Thanks,
> Michal

Thanks.

The following should work, in the U-Boot root:

        $ pip install kconfiglib
        $ UBOOTVERSION=2018.03-rc1 python
        >>> import kconfiglib
        >>> kconf = kconfiglib.Kconfig()

That will parse the Kconfig files (and generate any parsing-related
errors and warnings). See the documentation for what functionality is
available.

I just set the UBOOTVERSION environment variable to avoid a warning,
since it's referenced inside the Kconfig files (ordinarily it would be
exported from the makefiles). Not sure what actually depends on it.

There's already an old version of Kconfiglib that's used by
tools/genboardscfg.py and some other scripts in U-Boot by the way. If
that one ever starts to feel slow, Kconfiglib 2 should be faster
(though it would require updating genboardscfg.py to the new API).

Cheers,
Ulf
Ulf Magnusson Jan. 30, 2018, 1:50 p.m. UTC | #3
On Tue, Jan 30, 2018 at 2:38 PM, Ulf Magnusson <ulfalizer@gmail.com> wrote:
> On Tue, Jan 30, 2018 at 2:25 PM, Michal Simek <michal.simek@xilinx.com> wrote:
>> On 30.1.2018 14:02, Ulf Magnusson wrote:
>>> There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
>>> probably intended.
>>>
>>> No functional changes. Kconfig choices fall back on using the first
>>> (visible) symbol in the choice as the default if the default symbol is
>>> not visible.
>>>
>>> Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
>>> which prints the following warning:
>>>
>>>       warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice
>>>
>>> I've added a corresponding warning to the C tools too, which is
>>> currently in linux-next: https://patchwork.kernel.org/patch/9983667/
>>>
>>> Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
>>> ---
>>>  arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> index 3f922b4097..56b7846f63 100644
>>> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
>>>  choice
>>>       prompt "Boot mode"
>>>       depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
>>> -     default JTAG
>>> +     default JTAG_MODE
>>>
>>>  config JTAG_MODE
>>>       bool "JTAG_MODE"
>>>
>>
>> Applied. How to run this tool inside u-boot?
>>
>> Thanks,
>> Michal
>
> Thanks.
>
> The following should work, in the U-Boot root:
>
>         $ pip install kconfiglib
>         $ UBOOTVERSION=2018.03-rc1 python
>         >>> import kconfiglib
>         >>> kconf = kconfiglib.Kconfig()
>
> That will parse the Kconfig files (and generate any parsing-related
> errors and warnings). See the documentation for what functionality is
> available.
>
> I just set the UBOOTVERSION environment variable to avoid a warning,
> since it's referenced inside the Kconfig files (ordinarily it would be
> exported from the makefiles). Not sure what actually depends on it.
>
> There's already an old version of Kconfiglib that's used by
> tools/genboardscfg.py and some other scripts in U-Boot by the way. If
> that one ever starts to feel slow, Kconfiglib 2 should be faster
> (though it would require updating genboardscfg.py to the new API).
>
> Cheers,
> Ulf

Looks like this will work as well:

        $ UBOOTVERSION=`make ubootversion` python

Cheers,
Ulf
Michal Simek Jan. 30, 2018, 1:58 p.m. UTC | #4
On 30.1.2018 14:38, Ulf Magnusson wrote:
> On Tue, Jan 30, 2018 at 2:25 PM, Michal Simek <michal.simek@xilinx.com> wrote:
>> On 30.1.2018 14:02, Ulf Magnusson wrote:
>>> There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
>>> probably intended.
>>>
>>> No functional changes. Kconfig choices fall back on using the first
>>> (visible) symbol in the choice as the default if the default symbol is
>>> not visible.
>>>
>>> Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
>>> which prints the following warning:
>>>
>>>       warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice
>>>
>>> I've added a corresponding warning to the C tools too, which is
>>> currently in linux-next: https://patchwork.kernel.org/patch/9983667/
>>>
>>> Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
>>> ---
>>>  arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> index 3f922b4097..56b7846f63 100644
>>> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
>>>  choice
>>>       prompt "Boot mode"
>>>       depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
>>> -     default JTAG
>>> +     default JTAG_MODE
>>>
>>>  config JTAG_MODE
>>>       bool "JTAG_MODE"
>>>
>>
>> Applied. How to run this tool inside u-boot?
>>
>> Thanks,
>> Michal
> 
> Thanks.
> 
> The following should work, in the U-Boot root:
> 
>         $ pip install kconfiglib
>         $ UBOOTVERSION=2018.03-rc1 python
>         >>> import kconfiglib
>         >>> kconf = kconfiglib.Kconfig()

Nice.

> 
> That will parse the Kconfig files (and generate any parsing-related
> errors and warnings). See the documentation for what functionality is
> available.
> 
> I just set the UBOOTVERSION environment variable to avoid a warning,
> since it's referenced inside the Kconfig files (ordinarily it would be
> exported from the makefiles). Not sure what actually depends on it.
> 
> There's already an old version of Kconfiglib that's used by
> tools/genboardscfg.py and some other scripts in U-Boot by the way. If
> that one ever starts to feel slow, Kconfiglib 2 should be faster
> (though it would require updating genboardscfg.py to the new API).

I see this as the part of buildman and I use this tool quite often but
have never seen this zynqmp error.
I see it as part of genboardscfg and moveconfig but not buildman.

Thanks,
Michal
Ulf Magnusson Jan. 30, 2018, 2:05 p.m. UTC | #5
On Tue, Jan 30, 2018 at 2:58 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 30.1.2018 14:38, Ulf Magnusson wrote:
>> On Tue, Jan 30, 2018 at 2:25 PM, Michal Simek <michal.simek@xilinx.com> wrote:
>>> On 30.1.2018 14:02, Ulf Magnusson wrote:
>>>> There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was
>>>> probably intended.
>>>>
>>>> No functional changes. Kconfig choices fall back on using the first
>>>> (visible) symbol in the choice as the default if the default symbol is
>>>> not visible.
>>>>
>>>> Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib),
>>>> which prints the following warning:
>>>>
>>>>       warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice
>>>>
>>>> I've added a corresponding warning to the C tools too, which is
>>>> currently in linux-next: https://patchwork.kernel.org/patch/9983667/
>>>>
>>>> Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
>>>> ---
>>>>  arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>>> index 3f922b4097..56b7846f63 100644
>>>> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
>>>> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>>> @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
>>>>  choice
>>>>       prompt "Boot mode"
>>>>       depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
>>>> -     default JTAG
>>>> +     default JTAG_MODE
>>>>
>>>>  config JTAG_MODE
>>>>       bool "JTAG_MODE"
>>>>
>>>
>>> Applied. How to run this tool inside u-boot?
>>>
>>> Thanks,
>>> Michal
>>
>> Thanks.
>>
>> The following should work, in the U-Boot root:
>>
>>         $ pip install kconfiglib
>>         $ UBOOTVERSION=2018.03-rc1 python
>>         >>> import kconfiglib
>>         >>> kconf = kconfiglib.Kconfig()
>
> Nice.
>
>>
>> That will parse the Kconfig files (and generate any parsing-related
>> errors and warnings). See the documentation for what functionality is
>> available.
>>
>> I just set the UBOOTVERSION environment variable to avoid a warning,
>> since it's referenced inside the Kconfig files (ordinarily it would be
>> exported from the makefiles). Not sure what actually depends on it.
>>
>> There's already an old version of Kconfiglib that's used by
>> tools/genboardscfg.py and some other scripts in U-Boot by the way. If
>> that one ever starts to feel slow, Kconfiglib 2 should be faster
>> (though it would require updating genboardscfg.py to the new API).
>
> I see this as the part of buildman and I use this tool quite often but
> have never seen this zynqmp error.
> I see it as part of genboardscfg and moveconfig but not buildman.
>
> Thanks,
> Michal
>

The warning is new in both Kconfiglib and the C tools (only in
linux-next currently), so it won't get generated by anything in U-Boot
at the moment.

Cheers,
Ulf
diff mbox series

Patch

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 3f922b4097..56b7846f63 100644
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -107,7 +107,7 @@  config SPL_ZYNQMP_ALT_BOOTMODE
 choice
 	prompt "Boot mode"
 	depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
-	default JTAG
+	default JTAG_MODE
 
 config JTAG_MODE
 	bool "JTAG_MODE"