arm64: zynqmp: Fix misspelled choice default

PATCH New Ulf Magnusson 2 participants 6 messages Jan 30, 2018

Subsystems (2)

Arm (32-bit) Arm/Zynq architecture

lore

Share & tools

lore

Ulf Magnusson

author

2018-01-30 13:02 UTC #0 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

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 <[email protected]>

---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1

index 3f922b4097..56b7846f63 100644
@@ -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"

Signature · 1 line

2.14.1

Michal Simek

2018-01-30 13:25 UTC #1 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

Quoted 26 lines · Ulf Magnusson

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 <[email protected]>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
index 3f922b4097..56b7846f63 100644

arch/arm/cpu/armv8/zynqmp/Kconfig config SPL_ZYNQMP_ALT_BOOTMODE · line 113

Quoted 8 lines

arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1

@@ -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

author

2018-01-30 13:38 UTC #2 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

Quoted 32 lines · Michal Simek

Quoted 31 lines · Ulf Magnusson
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 <[email protected]>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1
index 3f922b4097..56b7846f63 100644
@@ -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
 

Quoted 8 lines

arch/arm/cpu/armv8/zynqmp/Kconfig config SPL_ZYNQMP_ALT_BOOTMODE · line 113
Quoted 3 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
 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

author

2018-01-30 13:50 UTC #3 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

Quoted 59 lines · Ulf Magnusson

Quoted 32 lines · Michal Simek
Quoted 31 lines · Ulf Magnusson
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 <[email protected]>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1
index 3f922b4097..56b7846f63 100644
@@ -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
 
Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig config SPL_ZYNQMP_ALT_BOOTMODE · line 113
Quoted 3 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
 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.

Quoted 7 lines

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

2018-01-30 13:58 UTC #4 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

In reply to Ulf Magnusson

Quoted 42 lines · Ulf Magnusson

Quoted 32 lines · Michal Simek
Quoted 31 lines · Ulf Magnusson
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 <[email protected]>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1
index 3f922b4097..56b7846f63 100644
@@ -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
 
Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig config SPL_ZYNQMP_ALT_BOOTMODE · line 113
Quoted 3 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
 config JTAG_MODE
      bool "JTAG_MODE"
Applied. How to run this tool inside u-boot?
Thanks,
Michal

Quoted 8 lines

Thanks.

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

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

Nice.

Quoted 5 lines

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

Quoted 8 lines

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

author

2018-01-30 14:05 UTC #5 lore raw

PATCH 1/1 arm64: zynqmp: Fix misspelled choice default

Quoted 68 lines · Michal Simek

Quoted 42 lines · Ulf Magnusson
Quoted 32 lines · Michal Simek
Quoted 31 lines · Ulf Magnusson
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 <[email protected]>
---
 arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +1 -1
index 3f922b4097..56b7846f63 100644
@@ -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
 
Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig config SPL_ZYNQMP_ALT_BOOTMODE · line 113
Quoted 3 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
 config JTAG_MODE
      bool "JTAG_MODE"
Applied. How to run this tool inside u-boot?
Thanks,
Michal
Quoted 8 lines
Thanks.
The following should work, in the U-Boot root:
        $ pip install kconfiglib
        $ UBOOTVERSION=2018.03-rc1 python
        >>> import kconfiglib
        >>> kconf = kconfiglib.Kconfig()
Nice.
Quoted 5 lines
That will parse the Kconfig files (and generate any parsing-related errors and warnings). See the documentation for what functionality is available.
Quoted 8 lines
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).

Quoted 7 lines

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