michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: Use $(...) instead of ${...} for getting variables

Browse Source 
Updates this to comply with the Zephyr Kconfig recommendations

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2025-08-12 11:09:05 +01:00
committed by Benjamin Cabé
parent ea9815ff34
commit db8f991c77
28 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Kconfig.zephyr
View File

@@ -7,7 +7,7 @@
source "Kconfig.constants"
osource "${APPLICATION_SOURCE_DIR}/VERSION"
osource "$(APPLICATION_SOURCE_DIR)/VERSION"
# Include Kconfig.defconfig files first so that they can override defaults and
# other symbol/choice properties by adding extra symbol/choice definitions.
@@ -963,7 +963,7 @@ config BUILD_OUTPUT_STRIP_PATHS
bool "Strip absolute paths from binaries"
default y
help
If the compiler supports it, strip the ${ZEPHYR_BASE} prefix from the
If the compiler supports it, strip the $(ZEPHYR_BASE) prefix from the
__FILE__ macro used in __ASSERT*, in the
.noinit."/home/joe/zephyr/fu/bar.c" section names and in any
application code.

2
boards/qemu/x86/Kconfig.defconfig
View File

@@ -100,7 +100,7 @@ config HAVE_CUSTOM_LINKER_SCRIPT
default y
config CUSTOM_LINKER_SCRIPT
default "${ZEPHYR_BASE}/boards/qemu/x86/qemu_x86_tiny.ld"
default "$(ZEPHYR_BASE)/boards/qemu/x86/qemu_x86_tiny.ld"
config X86_EXTRA_PAGE_TABLE_PAGES
# This is needed for gen_mmu.py to map the flash into memory

6
doc/build/sysbuild/images.rst vendored
View File

@@ -151,13 +151,13 @@ more complex to create but is the preferred method for adding images to upstream
config OTHER_APP_IMAGE_PATH
string
default "${ZEPHYR_MY_IMAGE_MODULE_DIR}/path/to/my_image" if OTHER_APP_IMAGE_MY_IMAGE
default "$(ZEPHYR_MY_IMAGE_MODULE_DIR)/path/to/my_image" if OTHER_APP_IMAGE_MY_IMAGE
help
Source directory of other app image.
.. note::
Remember to have ``source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"`` in the file if this
Remember to have ``source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"`` in the file if this
is being applied in an application ``Kconfig.sysbuild`` file.
.. group-tab:: ``sysbuild.cmake``
@@ -212,7 +212,7 @@ This can then be extended by :ref:`modules` like so:
default "my_second_image" if OTHER_APP_IMAGE_MY_SECOND_IMAGE
config OTHER_APP_IMAGE_PATH
default "${ZEPHYR_MY_SECOND_IMAGE_MODULE_DIR}/path/to/my_second_image" if OTHER_APP_IMAGE_MY_SECOND_IMAGE
default "$(ZEPHYR_MY_SECOND_IMAGE_MODULE_DIR)/path/to/my_second_image" if OTHER_APP_IMAGE_MY_SECOND_IMAGE
As can be seen, no additional CMake changes are needed to add an alternative image as the base
CMake code will add the replacement image instead of the original image, if selected.

2
drivers/usb/uvb/Kconfig
View File

@@ -22,6 +22,6 @@ config UVB_MAX_MESSAGES
module = UVB
module-str = USB virtual bus service
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
endif # UVB

2
kernel/Kconfig
View File

@@ -957,7 +957,7 @@ config STACK_CANARIES_ALL
config STACK_CANARIES_EXPLICIT
bool "Explicit protection"
depends on ENTROPY_GENERATOR || TEST_RANDOM_GENERATOR
depends on "${ZEPHYR_TOOLCHAIN_VARIANT}" = "zephyr"
depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
select NEED_LIBC_MEM_PARTITION if !STACK_CANARIES_TLS
select REQUIRES_STACK_CANARIES
help

2
lib/runtime/Kconfig
View File

@@ -4,7 +4,7 @@
config COMPILER_RT_SUPPORTED
bool
default y
depends on "${ZEPHYR_TOOLCHAIN_VARIANT}" = "llvm"
depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "llvm"
help
Selected when the compiler supports compiler-rt runtime library.

2
modules/nrf_wifi/bus/Kconfig
View File

@@ -43,7 +43,7 @@ config NRF71_ON_IPC
module = WIFI_NRF70_BUSLIB
module-dep = LOG
module-str = Log level for Wi-Fi nRF70 bus library
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
config WIFI_NRF70_BUSLIB_LOG_LEVEL
# Enable error by default

18
modules/trusted-firmware-m/Kconfig.tfm
View File

@@ -23,11 +23,11 @@ config TFM_BOARD
default "arm/musca_b1" if BOARD_V2M_MUSCA_B1
default "arm/musca_s1" if BOARD_V2M_MUSCA_S1
default "adi/max32657" if BOARD_MAX32657EVKIT_MAX32657_NS
default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9160" if SOC_NRF9160
default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9120" if SOC_NRF9120
default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP
default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP
default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf9160" if SOC_NRF9160
default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf9120" if SOC_NRF9120
default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP
default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP
help
The board name used for building TFM. Building with TFM requires that
TFM has been ported to the given board/SoC.
@@ -256,7 +256,7 @@ config TFM_BL2_SIGNING_KEY_PATH
string "Path to private key used to sign BL2 firmware images."
help
Path to binary BL2 signing private key
Default is ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/bl1/bl1_2/bl1_dummy_rotpk
Default is $(ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR)/bl1/bl1_2/bl1_dummy_rotpk
if it has not been changed on TF-M side for your board
endif # TFM_BL1
@@ -281,7 +281,7 @@ config TFM_MCUBOOT_SIGNATURE_TYPE
config TFM_KEY_FILE_S
string "Path to private key used to sign secure firmware images."
default "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/bl2/ext/mcuboot/root-${CONFIG_TFM_MCUBOOT_SIGNATURE_TYPE}.pem"
default "$(ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR)/bl2/ext/mcuboot/root-${CONFIG_TFM_MCUBOOT_SIGNATURE_TYPE}.pem"
help
The path and filename for the .pem file containing the private key
that should be used by the BL2 bootloader when signing secure
@@ -290,7 +290,7 @@ config TFM_KEY_FILE_S
config TFM_KEY_FILE_NS
string "Path to private key used to sign non-secure firmware images."
default "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/bl2/ext/mcuboot/root-${CONFIG_TFM_MCUBOOT_SIGNATURE_TYPE}_1.pem"
default "$(ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR)/bl2/ext/mcuboot/root-${CONFIG_TFM_MCUBOOT_SIGNATURE_TYPE}_1.pem"
help
The path and filename for the .pem file containing the private key
that should be used by the BL2 bootloader when signing non-secure
@@ -334,7 +334,7 @@ endchoice
config TFM_ETHOS_DRIVER_PATH_LOCAL
string "Path to a locally available Ethos-U driver or an empty string"
depends on SOC_SERIES_MPS3 || SOC_SERIES_MPS4
default "${ZEPHYR_HAL_ETHOS_U_MODULE_DIR}"
default "$(ZEPHYR_HAL_ETHOS_U_MODULE_DIR)"
help
Path to a locally available Ethos-U driver to be used for TF-M builds or
an empty string to allow TF-M to automatically fetch the Ethos-U

8
samples/drivers/mbox/Kconfig.sysbuild
View File

@@ -22,8 +22,8 @@ config REMOTE_BOARD
default "nrf54lm20dk/nrf54lm20a/cpuflpr" if $(BOARD) = "nrf54lm20dk"
default "ophelia4ev/cpuflpr" if $(BOARD) = "ophelia4ev"
default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
default "esp32_devkitc/esp32/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32_devkitc/esp32/procpu"
default "esp32s3_devkitm/esp32s3/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32s3_devkitm/esp32s3/procpu"
default "esp32c6_devkitc/esp32c6/lpcore" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32c6_devkitc/esp32c6/hpcore"
default "bl54l15_dvk/nrf54l15/cpuflpr" if "$(BOARD)${BOARD_QUALIFIERS}" = "bl54l15_dvk/nrf54l15/cpuapp"
default "esp32_devkitc/esp32/appcpu" if "$(BOARD)$(BOARD_QUALIFIERS)" = "esp32_devkitc/esp32/procpu"
default "esp32s3_devkitm/esp32s3/appcpu" if "$(BOARD)$(BOARD_QUALIFIERS)" = "esp32s3_devkitm/esp32s3/procpu"
default "esp32c6_devkitc/esp32c6/lpcore" if "$(BOARD)$(BOARD_QUALIFIERS)" = "esp32c6_devkitc/esp32c6/hpcore"
default "bl54l15_dvk/nrf54l15/cpuflpr" if "$(BOARD)$(BOARD_QUALIFIERS)" = "bl54l15_dvk/nrf54l15/cpuapp"
default "bl54l15u_dvk/nrf54l15/cpuflpr" if $(BOARD) = "bl54l15u_dvk"

2
samples/sysbuild/hello_world/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"
config REMOTE_BOARD
string "The board used for remote target"

2
share/sysbuild/images/firmware_loader/Kconfig
View File

@@ -32,6 +32,6 @@ config FIRMWARE_LOADER_IMAGE_NAME
config FIRMWARE_LOADER_IMAGE_PATH
string
default "${ZEPHYR_BASE}/samples/subsys/mgmt/mcumgr/smp_svr" if FIRMWARE_LOADER_IMAGE_SMP_SVR
default "$(ZEPHYR_BASE)/samples/subsys/mgmt/mcumgr/smp_svr" if FIRMWARE_LOADER_IMAGE_SMP_SVR
help
Source directory of firmware loader image.

6
subsys/bluetooth/Kconfig.logging
View File

@@ -364,7 +364,7 @@ endif # BT_VOCS_CLIENT
if BT_PBP
module = BT_PBP
module-str = "Public Broadcast Profile"
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
endif # BT_PBP
endmenu # Audio
@@ -549,7 +549,7 @@ endif # BT_IAS_CLIENT
if BT_IAS
module = BT_IAS
module-str = IAS
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
endif # BT_IAS
# OTS (subsys/bluetooth/services/ots/Kconfig)
@@ -563,7 +563,7 @@ endif # BT_OTS_CLIENT
if BT_OTS
module = BT_OTS
module-str = BT_OTS
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
endif # BT_OTS
endmenu # Services

2
subsys/testsuite/Kconfig
View File

@@ -56,7 +56,7 @@ config COVERAGE_NATIVE_GCOV
config COVERAGE_NATIVE_SOURCE
bool "Host compiler source based code coverage"
depends on NATIVE_BUILD
depends on "${ZEPHYR_TOOLCHAIN_VARIANT}" = "llvm"
depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "llvm"
help
Build natively with the compiler source based coverage options.
Today this is only supported with LLVM

2
tests/boards/nrf/nrfs/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2025 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"
config REMOTE_BOARD
string

2
tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2023 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/Kconfig"
source "$(ZEPHYR_BASE)/samples/bluetooth/bap_broadcast_sink/Kconfig"

2
tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/bap_broadcast_sink/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/audio_samples/bap_unicast_client/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/bap_unicast_client/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/bap_unicast_client/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/audio_samples/cap/acceptor/Kconfig
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/cap_acceptor/Kconfig"
source "$(ZEPHYR_BASE)/samples/bluetooth/cap_acceptor/Kconfig"

2
tests/bsim/bluetooth/audio_samples/cap/acceptor/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023-2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/cap_acceptor/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/cap_acceptor/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/audio_samples/cap/initiator/Kconfig
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/cap_initiator/Kconfig"
source "$(ZEPHYR_BASE)/samples/bluetooth/cap_initiator/Kconfig"

2
tests/bsim/bluetooth/audio_samples/cap/initiator/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023-2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/cap_initiator/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/cap_initiator/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/audio_samples/ccp/call_control_client/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023-2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/ccp_call_control_client/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/ccp_call_control_client/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/audio_samples/ccp/call_control_server/Kconfig.sysbuild
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2023-2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/bluetooth/ccp_call_control_server/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/ccp_call_control_server/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/bluetooth/samples/central_hr_peripheral_hr/Kconfig
View File

@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
# source sample's Kconfig, if any
# source "${ZEPHYR_BASE}/samples/bluetooth/central_hr/Kconfig"
# source "$(ZEPHYR_BASE)/samples/bluetooth/central_hr/Kconfig"
# OR
# source Zephyr Kernel's Kconfig, as below (not both)
menu "Zephyr Kernel"

2
tests/bsim/bluetooth/samples/central_hr_peripheral_hr/Kconfig.sysbuild
View File

@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
# source the samples' Kconfig.sysbuild, if any
source "${ZEPHYR_BASE}/samples/bluetooth/central_hr/Kconfig.sysbuild"
source "$(ZEPHYR_BASE)/samples/bluetooth/central_hr/Kconfig.sysbuild"
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
int

2
tests/bsim/net/sockets/echo_test/Kconfig
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2023 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
source "${ZEPHYR_BASE}/samples/net/sockets/echo_client/Kconfig"
source "$(ZEPHYR_BASE)/samples/net/sockets/echo_client/Kconfig"

2
tests/cmake/sysbuild_snippets/Kconfig.sysbuild
View File

@@ -19,4 +19,4 @@ config EXPECTED_APP_TEST_FOO_VAL
help
Expected application value for the test.
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"

2
tests/subsys/ipc/ipc_sessions/Kconfig.sysbuild
View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"
config REMOTE_BOARD
string "The board used for remote target"