michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards/Kconfig: $BOARD_REVISION -> $(BOARD_REVISION)

Browse source 
Add parentheses missing around $BOARD_REVISION.

The syntax without parentheses has been deprecated for at least 5 years:
374f488734

That same documentation states "Using the old syntax with an undefined
environment variable keeps the string as is." This what actually happens
on Windows where `build/zephyr/.config` looks like this:

  CONFIG_BOARD_REVISION="$BOARD_REVISION"

I found this because the behavior differs on Linux where the same,
"old" syntax produces this instead:

  CONFIG_BOARD_REVISION=""

This could be because environment variables work differently?
(BOARD_REVISION is passed from kconfig.cmake to kconfiglib.py thanks to
cmake -E env)

Let's not try to debug this and just drop the deprecated syntax. It
aligns both Windows and Linux on the same, expected, empty string
behavior.

Note these are the only two `def_string` found across all Kconfig files
right now.

Fixes commit c11b7852d1 ("Kconfig: add CONFIG_BOARD_REVISION")
Fixes commit e2ff2a88ba ("sysbuild: include HWMv2 Kconfig in sysbuild")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2024-03-11 00:08:38 +00:00 • committed by Henrik Brix Andersen
commit 811a74c019
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/Kconfig
View file

@ -12,7 +12,7 @@ config BOARD
soc/<arch>/<family>/<series> soc/<arch>/<family>/<series>
config BOARD_REVISION config BOARD_REVISION
def_string "$BOARD_REVISION" def_string "$(BOARD_REVISION)"
help help
If the BOARD has a revision field set, this is the revision. If the BOARD has a revision field set, this is the revision.
Otherwise, it is the empty string. For example, if BOARD is Otherwise, it is the empty string. For example, if BOARD is

2
share/sysbuild/Kconfig.v2
View file

@ -13,7 +13,7 @@ config BOARD
soc/<arch>/<family>/<series> soc/<arch>/<family>/<series>
config BOARD_REVISION config BOARD_REVISION
def_string "$BOARD_REVISION" def_string "$(BOARD_REVISION)"
help help
If the BOARD has a revision field set, this is the revision. If the BOARD has a revision field set, this is the revision.
Otherwise, it is the empty string. For example, if BOARD is Otherwise, it is the empty string. For example, if BOARD is