[nrf fromtree] kconfig: Use $(...) instead of ${...} for getting variables

Updates this to comply with the Zephyr Kconfig recommendations

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit db8f991)

Author: nordicjm

Kconfig.zephyr

@@ -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.
@@ -967,7 +967,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.

boards/qemu/x86/Kconfig.defconfig

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

doc/build/sysbuild/images.rst

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

drivers/usb/uvb/Kconfig

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

kernel/Kconfig

@@ -942,7 +942,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

lib/runtime/Kconfig

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

modules/nrf_wifi/bus/Kconfig

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

modules/trusted-firmware-m/Kconfig.tfm

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

samples/drivers/mbox/Kconfig.sysbuild

@@ -23,8 +23,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"

samples/sysbuild/hello_world/Kconfig.sysbuild

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