diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 7a1c1b1db5c6..d21d89f0ccf8 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -33,7 +33,7 @@ jobs: pip3 install -U pip pip3 install -U wheel grep -E "^setuptools" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U - grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U + grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff|^vermin|^python-dotenv" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U grep -E "^west" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U pip3 show -f west diff --git a/applications/ipc_radio/Kconfig b/applications/ipc_radio/Kconfig index f3424b684b07..f32e337df72c 100644 --- a/applications/ipc_radio/Kconfig +++ b/applications/ipc_radio/Kconfig @@ -69,6 +69,6 @@ endif # IPC_RADIO_BT module = IPC_RADIO module-str = "ipc_radio" -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" source "Kconfig.zephyr" diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig index 4919c8cc9c54..c5d19e92783d 100644 --- a/applications/matter_bridge/Kconfig +++ b/applications/matter_bridge/Kconfig @@ -182,8 +182,8 @@ config BRIDGE_EXPERIMENTAL default y if OPENTHREAD || BRIDGE_SMART_PLUG_SUPPORT select EXPERIMENTAL -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/Kconfig" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/bridge/Kconfig" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/applications/matter_weather_station/Kconfig b/applications/matter_weather_station/Kconfig index 3f3ad8bfb08c..8335b3374f66 100644 --- a/applications/matter_weather_station/Kconfig +++ b/applications/matter_weather_station/Kconfig @@ -39,7 +39,7 @@ config NRF_WIFI_LOW_POWER endif # CHIP_WIFI -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/applications/serial_lte_modem/Kconfig b/applications/serial_lte_modem/Kconfig index 8717575bb9fa..d2dc08aabfba 100644 --- a/applications/serial_lte_modem/Kconfig +++ b/applications/serial_lte_modem/Kconfig @@ -248,7 +248,7 @@ config SLM_SKIP_READY_MSG module = SLM module-str = serial modem -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" rsource "src/ftp_c/Kconfig" rsource "src/mqtt_c/Kconfig" diff --git a/boards/nordic/thingy91/Kconfig b/boards/nordic/thingy91/Kconfig index 516893391927..cbca8b611c46 100644 --- a/boards/nordic/thingy91/Kconfig +++ b/boards/nordic/thingy91/Kconfig @@ -61,4 +61,4 @@ endif # BOARD_THINGY91_NRF9160 || BOARD_THINGY91_NRF9160_NS module=BOARD module-dep=LOG module-str=Log level for board -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/boards/nordic/thingy91x/Kconfig b/boards/nordic/thingy91x/Kconfig index 09c7f5197753..2b1e2160d2d0 100644 --- a/boards/nordic/thingy91x/Kconfig +++ b/boards/nordic/thingy91x/Kconfig @@ -4,7 +4,7 @@ module=BOARD module-dep=LOG module-str=Log level for board -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS diff --git a/doc/_extensions/options_from_kconfig.py b/doc/_extensions/options_from_kconfig.py index 928d76f391a1..26d24f19efbe 100644 --- a/doc/_extensions/options_from_kconfig.py +++ b/doc/_extensions/options_from_kconfig.py @@ -8,6 +8,7 @@ from docutils import statemachine from docutils.parsers.rst import directives +from dotenv import load_dotenv from sphinx.application import Sphinx from sphinx.util.docutils import SphinxDirective @@ -62,6 +63,23 @@ def run(self): ) ) os.environ["ZEPHYR_BASE"] = str(self.config.options_from_kconfig_zephyr_dir) + + import zephyr_module + modules = zephyr_module.parse_modules(os.environ["ZEPHYR_BASE"]) + + kconfig_module_dirs = "" + for module in modules: + kconfig_module_dirs += zephyr_module.process_kconfig_module_dir(module.project, + module.meta, + False) + + import tempfile + f = tempfile.NamedTemporaryFile('w', encoding="utf-8", delete=False) + f.write(kconfig_module_dirs) + f.close() + load_dotenv(f.name) + os.unlink(f.name) + import kconfiglib self._monkey_patch_kconfiglib(kconfiglib) diff --git a/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_images.rst b/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_images.rst index e1d2827b116a..07438120c281 100644 --- a/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_images.rst +++ b/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_images.rst @@ -88,7 +88,7 @@ If the image selection is mandatory, the :file:`Kconfig.sysbuild` file can be om help Will include the ABC image in the build, which will... - source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" * :file:`sysbuild.cmake` file @@ -140,13 +140,13 @@ This can be handled using the following approach: default "abc" if NETCORE_ABC config NETCORE_IMAGE_PATH - default "${ZEPHYR_MY_MODULE_MODULE_DIR}/" if NETCORE_ABC + default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/" if NETCORE_ABC endif # !NETCORE_NONE endmenu - source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" * :file:`sysbuild.cmake` file - This file is optional and should be used only if specific custom configurations are required for the application. @@ -201,13 +201,13 @@ This can be handled using the following approach: default "abc" if FIRMWARE_LOADER_IMAGE_ABC config FIRMWARE_LOADER_IMAGE_PATH - default "${ZEPHYR_MY_MODULE_MODULE_DIR}/" if FIRMWARE_LOADER_IMAGE_ABC + default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/" if FIRMWARE_LOADER_IMAGE_ABC endif # !FIRMWARE_LOADER_IMAGE_NONE endmenu - source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" * :file:`sysbuild.cmake` file - This file is optional and should be used only if specific custom configurations are required for the application. @@ -303,7 +303,7 @@ Kconfig.sysbuild: default "abc" if NETCORE_ABC config NETCORE_IMAGE_PATH - default "${ZEPHYR_MY_MODULE_MODULE_DIR}/" if NETCORE_ABC + default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/" if NETCORE_ABC endif # !NETCORE_NONE diff --git a/doc/nrf/installation/recommended_versions.rst b/doc/nrf/installation/recommended_versions.rst index 3b26128ee76c..1434c515aa0b 100644 --- a/doc/nrf/installation/recommended_versions.rst +++ b/doc/nrf/installation/recommended_versions.rst @@ -233,7 +233,7 @@ Building and running applications, samples, and tests * - packaging - :ncs-tool-version:`PACKAGING_VERSION` * - progress - - :ncs-tool-version:`PROGRESS_VERSION` + - :ncs-tool-version:`TQDM_VERSION` * - pyelftools - :ncs-tool-version:`PYELFTOOLS_VERSION` * - pylint diff --git a/doc/nrf/libraries/security/bootloader/fw_info.rst b/doc/nrf/libraries/security/bootloader/fw_info.rst index 211610263b55..96de05069197 100644 --- a/doc/nrf/libraries/security/bootloader/fw_info.rst +++ b/doc/nrf/libraries/security/bootloader/fw_info.rst @@ -119,7 +119,7 @@ To create an EXT_API, complete the following steps: id = 0xBEEF flags = 0 ver = 1 - source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" + source "$(ZEPHYR_NRF_MODULE_DIR_BASE)/subsys/fw_info/Kconfig.template.fw_info_ext_api" #. Declare a new struct type: diff --git a/doc/nrf/templates/cheat_sheet.rst b/doc/nrf/templates/cheat_sheet.rst index f3dc797c4690..12c09b32f4f5 100644 --- a/doc/nrf/templates/cheat_sheet.rst +++ b/doc/nrf/templates/cheat_sheet.rst @@ -575,7 +575,7 @@ Kconfig: id = 0xBEEF flags = 0 ver = 1 - source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" + source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" cmake: diff --git a/doc/requirements.txt b/doc/requirements.txt index ae04d1250be6..a8473506b343 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -27,3 +27,4 @@ sphinx_markdown_tables # | | | X | | | sphinxcontrib-mscgen # | X | | | | X | | | sphinxcontrib-plantuml>=0.27 # | | | | | | X | | west>=1.0.0 # | | | | | | | X | +python-dotenv # | | X | | | | | | diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index 58c8a04fb738..e322143d6a5b 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -57,6 +57,6 @@ config FLASH_RPC_SYS_INIT module = FLASH_RPC module-str = Flash over nRF RPC -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # FLASH_RPC diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c9acffdfddf7..f90fc3b9c993 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -93,7 +93,7 @@ module=ETH_RTT module-dep=LOG module-str=Log level module-help=Sets log level for Ethernet over RTT driver. -source "${ZEPHYR_BASE}/subsys/net/Kconfig.template.log_config.net" +source "$(ZEPHYR_BASE)/subsys/net/Kconfig.template.log_config.net" config ETH_RTT_DEBUG_HEX_DUMP bool "Print hex dumps" diff --git a/drivers/sensor/paw3212/Kconfig b/drivers/sensor/paw3212/Kconfig index 6ae043cdf527..0d4b1d225183 100644 --- a/drivers/sensor/paw3212/Kconfig +++ b/drivers/sensor/paw3212/Kconfig @@ -44,6 +44,6 @@ endchoice module = PAW3212 module-str = PAW3212 -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #PAW3212 diff --git a/drivers/sensor/pmw3360/Kconfig b/drivers/sensor/pmw3360/Kconfig index a585ab52a248..cb3a269ff873 100644 --- a/drivers/sensor/pmw3360/Kconfig +++ b/drivers/sensor/pmw3360/Kconfig @@ -63,6 +63,6 @@ endchoice module = PMW3360 module-str = PMW3360 -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #PMW3360 diff --git a/lib/app_jwt/Kconfig b/lib/app_jwt/Kconfig index 0d227413d8d5..98c820778a22 100644 --- a/lib/app_jwt/Kconfig +++ b/lib/app_jwt/Kconfig @@ -34,6 +34,6 @@ config APP_JWT_PRINT_EXPORTED_PUBKEY_DER module=APP_JWT module-str=User App JWT -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # APP_JWT diff --git a/lib/at_cmd_custom/Kconfig b/lib/at_cmd_custom/Kconfig index 389a4ace18a7..01b7f16813e4 100644 --- a/lib/at_cmd_custom/Kconfig +++ b/lib/at_cmd_custom/Kconfig @@ -12,6 +12,6 @@ if AT_CMD_CUSTOM module=AT_CMD_CUSTOM module-dep=LOG module-str= AT custom command library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AT_CMD_CUSTOM diff --git a/lib/at_host/Kconfig b/lib/at_host/Kconfig index de165f694d32..fb2e9f78a274 100644 --- a/lib/at_host/Kconfig +++ b/lib/at_host/Kconfig @@ -15,34 +15,39 @@ if AT_HOST_LIBRARY config AT_HOST_UART_INIT_TIMEOUT int "Timeout waiting for a valid UART line on init (ms)" - help - If the selected UART has error conditions during init caused by - e. g. a floating RX line during boot, at_host will clear the - errors and retry for this amount of time. default 500 + help + If the selected UART has error conditions during init caused by + e. g. a floating RX line during boot, at_host will clear the + errors and retry for this amount of time. choice prompt "Termination Mode" default CR_TERMINATION depends on AT_HOST_LIBRARY help - Sets the termination ending from the serial terminal - Levels are: - - NULL Termination - - CR Termination - - LF Termination - - CR+LF Termination - - WARNING! Some AT commands (like AT+CMGS) use CR internally. - Selecting CR Termination will render those commands unavailable. - config NULL_TERMINATION - bool "NULL Termination" - config CR_TERMINATION - bool "CR Termination" - config LF_TERMINATION - bool "LF Termination" - config CR_LF_TERMINATION - bool "CR+LF Termination" + Sets the termination ending from the serial terminal + Levels are: + - NULL Termination + - CR Termination + - LF Termination + - CR+LF Termination + + WARNING! Some AT commands (like AT+CMGS) use CR internally. + Selecting CR Termination will render those commands unavailable. + +config NULL_TERMINATION + bool "NULL Termination" + +config CR_TERMINATION + bool "CR Termination" + +config LF_TERMINATION + bool "LF Termination" + +config CR_LF_TERMINATION + bool "CR+LF Termination" + endchoice config AT_HOST_TERMINATION @@ -54,11 +59,11 @@ config AT_HOST_TERMINATION config AT_HOST_CMD_MAX_LEN int "Maximum AT command length" - help - The maximum allowed length of an AT command passed through the - AT host. The space is allocated statically. range 0 4096 default 4096 + help + The maximum allowed length of an AT command passed through the + AT host. The space is allocated statically. config AT_HOST_THREAD_PRIO int "AT host workqueue thread priority level" @@ -72,6 +77,6 @@ config AT_HOST_STACK_SIZE module = AT_HOST module-str = AT host -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AT_HOST_LIBRARY diff --git a/lib/at_monitor/Kconfig b/lib/at_monitor/Kconfig index aed71406ab96..1d539e7d6326 100644 --- a/lib/at_monitor/Kconfig +++ b/lib/at_monitor/Kconfig @@ -20,6 +20,6 @@ config SYSTEM_WORKQUEUE_STACK_SIZE module=AT_MONITOR module-dep=LOG module-str= AT notification monitor library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AT_MONITOR diff --git a/lib/bin/lwm2m_carrier/Kconfig b/lib/bin/lwm2m_carrier/Kconfig index 85584d06d37c..faf7ea55ba80 100644 --- a/lib/bin/lwm2m_carrier/Kconfig +++ b/lib/bin/lwm2m_carrier/Kconfig @@ -374,6 +374,6 @@ config LWM2M_CARRIER_SHELL module=LWM2M_CARRIER module-dep=LOG module-str=LwM2M carrier library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # LWM2M_CARRIER diff --git a/lib/contin_array/Kconfig b/lib/contin_array/Kconfig index 42799c3296ee..b75c47676238 100644 --- a/lib/contin_array/Kconfig +++ b/lib/contin_array/Kconfig @@ -8,12 +8,12 @@ config CONTIN_ARRAY bool "Continuous array library" help - Enable continuous array library + Enable continuous array library if CONTIN_ARRAY module = CONTIN_ARRAY module-str = Continuous array -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #CONTIN_ARRAY diff --git a/lib/data_fifo/Kconfig b/lib/data_fifo/Kconfig index a927d9b29abc..a4ba2ab4a4ad 100644 --- a/lib/data_fifo/Kconfig +++ b/lib/data_fifo/Kconfig @@ -13,6 +13,6 @@ if DATA_FIFO module = DATA_FIFO module-str = Data first-in first-out -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #DATA_FIFO diff --git a/lib/date_time/Kconfig b/lib/date_time/Kconfig index 629c2eaf4eda..c4497fb1e94d 100644 --- a/lib/date_time/Kconfig +++ b/lib/date_time/Kconfig @@ -67,6 +67,6 @@ config DATE_TIME_NTP_QUERY_TIME_SECONDS module=DATE_TIME module-dep=LOG module-str=Date time module -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # DATE_TIME diff --git a/lib/dk_buttons_and_leds/Kconfig b/lib/dk_buttons_and_leds/Kconfig index 2d15dd394f48..437289706432 100644 --- a/lib/dk_buttons_and_leds/Kconfig +++ b/lib/dk_buttons_and_leds/Kconfig @@ -20,7 +20,7 @@ config DK_LIBRARY_DYNAMIC_BUTTON_HANDLERS module = DK_LIBRARY module-str = DK library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config DK_LIBRARY_SHELL bool "DK_LIBRARY SHELL" diff --git a/lib/edge_impulse/Kconfig b/lib/edge_impulse/Kconfig index 518efe8cb86a..13d4936b6b60 100644 --- a/lib/edge_impulse/Kconfig +++ b/lib/edge_impulse/Kconfig @@ -98,6 +98,6 @@ config EI_WRAPPER_DEBUG_MODE module=EI_WRAPPER module-dep=LOG module-str=Edge Impulse NCS wrapper -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # EI_WRAPPER diff --git a/lib/fatal_error/Kconfig b/lib/fatal_error/Kconfig index 6b6ae61315b4..65e979eadb2d 100644 --- a/lib/fatal_error/Kconfig +++ b/lib/fatal_error/Kconfig @@ -15,6 +15,6 @@ if RESET_ON_FATAL_ERROR module = FATAL_ERROR module-str = Fatal error -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # RESET_ON_FATAL_ERROR diff --git a/lib/location/Kconfig b/lib/location/Kconfig index 6bcdfb08e4dc..f892aae3661d 100644 --- a/lib/location/Kconfig +++ b/lib/location/Kconfig @@ -302,6 +302,6 @@ endif # LOCATION_METHOD_WIFI module = LOCATION module-str = Location -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # LOCATION diff --git a/lib/lte_link_control/Kconfig b/lib/lte_link_control/Kconfig index e963500fd8e3..dcb6555968fa 100644 --- a/lib/lte_link_control/Kconfig +++ b/lib/lte_link_control/Kconfig @@ -458,6 +458,6 @@ config LTE_LC_WORKQUEUE_STACK_SIZE module = LTE_LINK_CONTROL module-dep = LOG module-str = LTE link control library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # LTE_LINK_CONTROL diff --git a/lib/modem_antenna/Kconfig b/lib/modem_antenna/Kconfig index 5bbe602d7c76..c6df53608389 100644 --- a/lib/modem_antenna/Kconfig +++ b/lib/modem_antenna/Kconfig @@ -80,6 +80,6 @@ config MODEM_ANTENNA_AT_MIPIRFFECTRL_PWROFF module=MODEM_ANTENNA module-dep=LOG module-str=Modem antenna -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MODEM_ANTENNA diff --git a/lib/modem_battery/Kconfig b/lib/modem_battery/Kconfig index 28d289f13700..7f1650e00d4c 100644 --- a/lib/modem_battery/Kconfig +++ b/lib/modem_battery/Kconfig @@ -44,6 +44,6 @@ config MODEM_BATTERY_POFWARN_VOLTAGE module = MODEM_BATTERY module-dep = LOG module-str = Modem battery library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MODEM_BATTERY diff --git a/lib/modem_key_mgmt/Kconfig b/lib/modem_key_mgmt/Kconfig index aa9049cdd2aa..2ce94f0037a7 100644 --- a/lib/modem_key_mgmt/Kconfig +++ b/lib/modem_key_mgmt/Kconfig @@ -13,6 +13,6 @@ if MODEM_KEY_MGMT module = MODEM_KEY_MGMT module-dep = LOG module-str = Modem key management -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MODEM_KEY_MGMT diff --git a/lib/modem_slm/Kconfig b/lib/modem_slm/Kconfig index 1cbe1b6102a1..4cc09640e06d 100644 --- a/lib/modem_slm/Kconfig +++ b/lib/modem_slm/Kconfig @@ -92,6 +92,6 @@ config MODEM_SLM_INDICATE_PIN module = MODEM_SLM module-str = Modem SLM -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MODEM_SLM diff --git a/lib/pcm_mix/Kconfig b/lib/pcm_mix/Kconfig index a473074ca4c6..d662c6de9e3a 100644 --- a/lib/pcm_mix/Kconfig +++ b/lib/pcm_mix/Kconfig @@ -12,6 +12,6 @@ if PCM_MIX module = PCM_MIX module-str = pcm-mix -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" -endif #PCM_MIX +endif # PCM_MIX diff --git a/lib/pcm_stream_channel_modifier/Kconfig b/lib/pcm_stream_channel_modifier/Kconfig index 8eae5f9706e3..6be27c00e748 100644 --- a/lib/pcm_stream_channel_modifier/Kconfig +++ b/lib/pcm_stream_channel_modifier/Kconfig @@ -13,6 +13,6 @@ if PSCM module = PSCM module-str = PCM Stream Channel Modifier -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #PSCM diff --git a/lib/pdn/Kconfig b/lib/pdn/Kconfig index 172bdbf82074..17efaf6b4c8e 100644 --- a/lib/pdn/Kconfig +++ b/lib/pdn/Kconfig @@ -97,6 +97,6 @@ config PDN_ESM_STRERROR module=PDN module-dep=LOG module-str=PDN library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # PDN diff --git a/lib/sample_rate_converter/Kconfig b/lib/sample_rate_converter/Kconfig index de4e763e0586..798b6e473c1f 100644 --- a/lib/sample_rate_converter/Kconfig +++ b/lib/sample_rate_converter/Kconfig @@ -19,7 +19,7 @@ if SAMPLE_RATE_CONVERTER module = SAMPLE_RATE_CONVERTER module-str = Sample Rate Converter -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config SAMPLE_RATE_CONVERTER_FILTER_TEST bool "Include the test filters for the sample rate converter" diff --git a/lib/sms/Kconfig b/lib/sms/Kconfig index be448b2e1b5a..4410f8f740a5 100644 --- a/lib/sms/Kconfig +++ b/lib/sms/Kconfig @@ -28,6 +28,6 @@ config SMS_STATUS_REPORT module=SMS module-dep=LOG module-str= SMS library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # SMS diff --git a/lib/st25r3911b/Kconfig b/lib/st25r3911b/Kconfig index 70817129244a..c18e51585d49 100644 --- a/lib/st25r3911b/Kconfig +++ b/lib/st25r3911b/Kconfig @@ -22,6 +22,6 @@ if ST25R3911B_LIB module = ST25R3911B_LIB module-str = ST25R3911B -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # ST25R3911B_LIB diff --git a/lib/tone/Kconfig b/lib/tone/Kconfig index 09904db81422..6f27fa164a91 100644 --- a/lib/tone/Kconfig +++ b/lib/tone/Kconfig @@ -5,7 +5,6 @@ menuconfig TONE bool "TONE - Sinus creation library" - default n select CMSIS_DSP select CMSIS_DSP_FASTMATH help @@ -15,6 +14,6 @@ if TONE module = TONE module-str = tone -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #TONE diff --git a/modules/mcuboot/boot/zephyr/Kconfig b/modules/mcuboot/boot/zephyr/Kconfig index 20ac667f650f..267f80d5f4c5 100644 --- a/modules/mcuboot/boot/zephyr/Kconfig +++ b/modules/mcuboot/boot/zephyr/Kconfig @@ -12,16 +12,20 @@ config BOOT_USE_MIN_PARTITION_SIZE partition=MCUBOOT_SCRATCH partition-size=0x1e000 -source "${ZEPHYR_BASE}/../nrf/subsys/partition_manager/Kconfig.template.partition_config" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/partition_manager/Kconfig.template.partition_config" partition=MCUBOOT_PAD + if SOC_SERIES_NRF54LX partition-size=0x800 -source "${ZEPHYR_BASE}/../nrf/subsys/partition_manager/Kconfig.template.partition_config" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/partition_manager/Kconfig.template.partition_config" + endif + if !SOC_SERIES_NRF54LX partition-size=0x200 -source "${ZEPHYR_BASE}/../nrf/subsys/partition_manager/Kconfig.template.partition_config" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/partition_manager/Kconfig.template.partition_config" + endif config PM_PARTITION_SIZE_MCUBOOT diff --git a/modules/memfault-firmware-sdk/Kconfig b/modules/memfault-firmware-sdk/Kconfig index 68fcfd7f38b8..d303cb63f341 100644 --- a/modules/memfault-firmware-sdk/Kconfig +++ b/modules/memfault-firmware-sdk/Kconfig @@ -252,13 +252,15 @@ config MEMFAULT_NCS_INTERNAL_FLASH_BACKED_COREDUMP Use internal flash to store coredump data if MEMFAULT_NCS_INTERNAL_FLASH_BACKED_COREDUMP + config MEMFAULT_NCS_FLASH_REGION_SIZE hex default $(dt_node_int_prop_hex,$(DT_CHOSEN_ZEPHYR_FLASH),erase-block-size) partition=MEMFAULT_STORAGE partition-size=0x10000 -source "${ZEPHYR_BASE}/../nrf/subsys/partition_manager/Kconfig.template.partition_config" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/partition_manager/Kconfig.template.partition_config" + endif # MEMFAULT_NCS_INTERNAL_FLASH_BACKED_COREDUMP # We want to encourage the use of a dedicated workqueue to upload data periodically, @@ -292,6 +294,6 @@ endif # HW_ID_LIBRARY module = MEMFAULT_NCS module-dep = LOG module-str = Memfault NCS module -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MEMFAULT diff --git a/modules/openthread/Kconfig b/modules/openthread/Kconfig index 8becc921267d..324490257db6 100644 --- a/modules/openthread/Kconfig +++ b/modules/openthread/Kconfig @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Load the main OpenThread stack Kconfig file -source "${ZEPHYR_BASE}/modules/openthread/Kconfig" +source "$(ZEPHYR_BASE)/modules/openthread/Kconfig" if OPENTHREAD diff --git a/samples/app_jwt/Kconfig b/samples/app_jwt/Kconfig index ae8a19df3940..877c400574d2 100644 --- a/samples/app_jwt/Kconfig +++ b/samples/app_jwt/Kconfig @@ -8,10 +8,10 @@ menu "Application JWT" module = APPLICATION_JWT module-str = Application JWT -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu menu "Zephyr Kernel" - source "Kconfig.zephyr" +source "Kconfig.zephyr" endmenu diff --git a/samples/bluetooth/direct_test_mode/Kconfig b/samples/bluetooth/direct_test_mode/Kconfig index f7763dcd7447..93cc5688a156 100644 --- a/samples/bluetooth/direct_test_mode/Kconfig +++ b/samples/bluetooth/direct_test_mode/Kconfig @@ -98,6 +98,6 @@ config DTM_FAST_RAMP_UP module = DTM_TRANSPORT module-str = "DTM_transport" -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" source "Kconfig.zephyr" diff --git a/samples/bluetooth/direct_test_mode/Kconfig.sysbuild b/samples/bluetooth/direct_test_mode/Kconfig.sysbuild index a7c593d5c9c5..842c2be5a1f3 100644 --- a/samples/bluetooth/direct_test_mode/Kconfig.sysbuild +++ b/samples/bluetooth/direct_test_mode/Kconfig.sysbuild @@ -21,7 +21,7 @@ config APPCORE_IMAGE_NAME default "remote_hci" if APPCORE_REMOTE_HCI config APPCORE_IMAGE_PATH - default "${ZEPHYR_NRF_MODULE_DIR}/samples/bluetooth/direct_test_mode/remote_hci" if APPCORE_REMOTE_HCI + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/bluetooth/direct_test_mode/remote_hci" if APPCORE_REMOTE_HCI choice DTM_TRANSPORT default DTM_TRANSPORT_TWOWIRE diff --git a/samples/bluetooth/direct_test_mode/remote_hci/Kconfig b/samples/bluetooth/direct_test_mode/remote_hci/Kconfig index f4e870470b31..0797c2e4e8c4 100644 --- a/samples/bluetooth/direct_test_mode/remote_hci/Kconfig +++ b/samples/bluetooth/direct_test_mode/remote_hci/Kconfig @@ -48,6 +48,6 @@ config REMOTE_HCI_TX_THREAD_PRIORITY module = DTM_REMOTE_HCI module-str = "DTM_remote_hci" -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" source "Kconfig.zephyr" diff --git a/samples/bluetooth/enocean/Kconfig.sysbuild b/samples/bluetooth/enocean/Kconfig.sysbuild index d56170702508..310fc006f210 100644 --- a/samples/bluetooth/enocean/Kconfig.sysbuild +++ b/samples/bluetooth/enocean/Kconfig.sysbuild @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" +source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" config NRF_DEFAULT_IPC_RADIO default y diff --git a/samples/bluetooth/mesh/chat/Kconfig b/samples/bluetooth/mesh/chat/Kconfig index f8fe493f5809..7a1e44979df0 100644 --- a/samples/bluetooth/mesh/chat/Kconfig +++ b/samples/bluetooth/mesh/chat/Kconfig @@ -30,4 +30,4 @@ endmenu module = BT_MESH_CHAT_CLI module-str = BT Mesh Chat Client model -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/bluetooth/nrf_auraconfig/Kconfig b/samples/bluetooth/nrf_auraconfig/Kconfig index 20d79d1edded..08cbac9244dc 100644 --- a/samples/bluetooth/nrf_auraconfig/Kconfig +++ b/samples/bluetooth/nrf_auraconfig/Kconfig @@ -4,12 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/audio/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/bluetooth/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/modules/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/utils/Kconfig" - -#----------------------------------------------------------------------------# +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/audio/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/bluetooth/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/modules/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/utils/Kconfig" config TRANSPORT_BIS bool "Use BIS (Broadcast Isochronous Stream)" diff --git a/samples/cellular/battery/Kconfig b/samples/cellular/battery/Kconfig index 891d8495d7ec..88eb63a69f5a 100644 --- a/samples/cellular/battery/Kconfig +++ b/samples/cellular/battery/Kconfig @@ -19,6 +19,6 @@ source "Kconfig.zephyr" module = BATTERY_SAMPLE module-str = Battery sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu diff --git a/samples/cellular/gnss/Kconfig b/samples/cellular/gnss/Kconfig index 3f482bc3033a..02246be992c2 100644 --- a/samples/cellular/gnss/Kconfig +++ b/samples/cellular/gnss/Kconfig @@ -172,4 +172,4 @@ endmenu module = GNSS_SAMPLE module-str = GNSS sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/cellular/lte_ble_gateway/Kconfig b/samples/cellular/lte_ble_gateway/Kconfig index 4a9af59876f6..48cac9b56919 100644 --- a/samples/cellular/lte_ble_gateway/Kconfig +++ b/samples/cellular/lte_ble_gateway/Kconfig @@ -22,7 +22,7 @@ endmenu module=LTE_BLE_GW module-dep=LOG module-str= LTE BLE gateway sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/cellular/lwm2m_client/Kconfig b/samples/cellular/lwm2m_client/Kconfig index 374518949ac8..aa352f18c2d2 100644 --- a/samples/cellular/lwm2m_client/Kconfig +++ b/samples/cellular/lwm2m_client/Kconfig @@ -149,7 +149,7 @@ config APP_LWM2M_CONFORMANCE_TESTING module = APP module-dep = LOG module-str = Log level for sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu # Application sample diff --git a/samples/cellular/modem_trace_flash/Kconfig b/samples/cellular/modem_trace_flash/Kconfig index f5bb9c30e96c..5cafdd11ca96 100644 --- a/samples/cellular/modem_trace_flash/Kconfig +++ b/samples/cellular/modem_trace_flash/Kconfig @@ -10,7 +10,7 @@ endmenu module = MODEM_TRACE_FLASH_SAMPLE module-str = Modem trace flash backend -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/cellular/nrf_cloud_coap_cell_location/Kconfig b/samples/cellular/nrf_cloud_coap_cell_location/Kconfig index d5801764406c..4811d35af9f8 100644 --- a/samples/cellular/nrf_cloud_coap_cell_location/Kconfig +++ b/samples/cellular/nrf_cloud_coap_cell_location/Kconfig @@ -36,7 +36,7 @@ config COAP_CELL_SEND_DEVICE_STATUS module = NRF_CLOUD_COAP_CELL_LOCATION_SAMPLE module-str = nRF Cloud CoAP Cellular Location Sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu diff --git a/samples/cellular/nrf_cloud_multi_service/Kconfig b/samples/cellular/nrf_cloud_multi_service/Kconfig index d763969aa165..580317874b27 100644 --- a/samples/cellular/nrf_cloud_multi_service/Kconfig +++ b/samples/cellular/nrf_cloud_multi_service/Kconfig @@ -323,7 +323,7 @@ if NRF_CLOUD_COAP module-str = CoAP Multi Service endif module = MULTI_SERVICE -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/cellular/nrf_cloud_rest_cell_location/Kconfig b/samples/cellular/nrf_cloud_rest_cell_location/Kconfig index c0bb23004b3d..078cc8faaabf 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/Kconfig +++ b/samples/cellular/nrf_cloud_rest_cell_location/Kconfig @@ -46,4 +46,4 @@ endmenu module = NRF_CLOUD_REST_CELL_LOCATION_SAMPLE module-str = nRF Cloud REST Cellular Location Sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/cellular/nrf_cloud_rest_device_message/Kconfig b/samples/cellular/nrf_cloud_rest_device_message/Kconfig index 17bef6d83a7c..1dd64ff48c7b 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/Kconfig +++ b/samples/cellular/nrf_cloud_rest_device_message/Kconfig @@ -34,4 +34,4 @@ endmenu module = NRF_CLOUD_REST_DEVICE_MESSAGE_SAMPLE module-str = nRF Cloud Rest Sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/cellular/nrf_cloud_rest_fota/Kconfig b/samples/cellular/nrf_cloud_rest_fota/Kconfig index b5d99522225a..8d1a1299271a 100644 --- a/samples/cellular/nrf_cloud_rest_fota/Kconfig +++ b/samples/cellular/nrf_cloud_rest_fota/Kconfig @@ -31,4 +31,4 @@ endmenu module = NRF_CLOUD_REST_FOTA_SAMPLE module-str = nRF Cloud Rest FOTA Sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/cellular/udp/Kconfig b/samples/cellular/udp/Kconfig index 1c1bb66e510c..b958a31aeabf 100644 --- a/samples/cellular/udp/Kconfig +++ b/samples/cellular/udp/Kconfig @@ -67,7 +67,7 @@ endmenu module = UDP module-str = UDP sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/debug/memfault/Kconfig b/samples/debug/memfault/Kconfig index 7ec395b24592..9165acf23227 100644 --- a/samples/debug/memfault/Kconfig +++ b/samples/debug/memfault/Kconfig @@ -10,4 +10,4 @@ endmenu module = MEMFAULT_SAMPLE module-str = Memfault sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/dect/dect_phy/hello_dect/Kconfig b/samples/dect/dect_phy/hello_dect/Kconfig index d41f0cede148..9762385a51d9 100644 --- a/samples/dect/dect_phy/hello_dect/Kconfig +++ b/samples/dect/dect_phy/hello_dect/Kconfig @@ -48,7 +48,7 @@ config RX_PERIOD_S module = DECT_PHY_HELLO module-str = DECT NR+ PHY Hello -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/esb/esb_monitor/Kconfig b/samples/esb/esb_monitor/Kconfig index cbabfdc1b319..696472c26b52 100644 --- a/samples/esb/esb_monitor/Kconfig +++ b/samples/esb/esb_monitor/Kconfig @@ -61,6 +61,6 @@ endif module = ESB_MONITOR_APP module-str = "ESB Monitor app" -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu diff --git a/samples/matter/light_bulb/Kconfig b/samples/matter/light_bulb/Kconfig index 4e9c7bdc73f3..568fd74e1110 100644 --- a/samples/matter/light_bulb/Kconfig +++ b/samples/matter/light_bulb/Kconfig @@ -18,8 +18,8 @@ endchoice endif # OPENTHREAD -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" rsource "src/aws_iot_integration/Kconfig" diff --git a/samples/matter/light_switch/Kconfig b/samples/matter/light_switch/Kconfig index 3a5456220831..98d44c884268 100644 --- a/samples/matter/light_switch/Kconfig +++ b/samples/matter/light_switch/Kconfig @@ -44,7 +44,7 @@ endif # CHIP_WIFI config CHIP_ENABLE_READ_CLIENT default y -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/lock/Kconfig b/samples/matter/lock/Kconfig index 78756f750346..01b21544c913 100644 --- a/samples/matter/lock/Kconfig +++ b/samples/matter/lock/Kconfig @@ -174,7 +174,7 @@ config MAIN_STACK_SIZE endif -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/manufacturer_specific/Kconfig b/samples/matter/manufacturer_specific/Kconfig index 402fc9e317d1..96b80dd4e338 100644 --- a/samples/matter/manufacturer_specific/Kconfig +++ b/samples/matter/manufacturer_specific/Kconfig @@ -18,7 +18,7 @@ endchoice endif # OPENTHREAD -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/manufacturer_specific/Kconfig.sysbuild b/samples/matter/manufacturer_specific/Kconfig.sysbuild index ada45866b357..b997bce5ae9f 100644 --- a/samples/matter/manufacturer_specific/Kconfig.sysbuild +++ b/samples/matter/manufacturer_specific/Kconfig.sysbuild @@ -81,4 +81,4 @@ endif # BOOTLOADER_MCUBOOT config MATTER_FACTORY_DATA_GENERATE default y -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" +source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" diff --git a/samples/matter/smoke_co_alarm/Kconfig b/samples/matter/smoke_co_alarm/Kconfig index d1eeea1289d7..e64ccaa795ab 100644 --- a/samples/matter/smoke_co_alarm/Kconfig +++ b/samples/matter/smoke_co_alarm/Kconfig @@ -33,7 +33,7 @@ config NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_MAX config OPENTHREAD_DEFAULT_TX_POWER default 0 -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/template/Kconfig b/samples/matter/template/Kconfig index e22557870489..8fb219d2b7b0 100644 --- a/samples/matter/template/Kconfig +++ b/samples/matter/template/Kconfig @@ -18,7 +18,7 @@ endchoice endif # OPENTHREAD -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/thermostat/Kconfig b/samples/matter/thermostat/Kconfig index 7086452de42e..f0b4cea1eb21 100644 --- a/samples/matter/thermostat/Kconfig +++ b/samples/matter/thermostat/Kconfig @@ -42,7 +42,7 @@ endchoice endif # OPENTHREAD -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/matter/window_covering/Kconfig b/samples/matter/window_covering/Kconfig index ac43cdfeb56d..43a36fa9b55c 100644 --- a/samples/matter/window_covering/Kconfig +++ b/samples/matter/window_covering/Kconfig @@ -18,7 +18,7 @@ config STATE_LEDS config OPENTHREAD_DEFAULT_TX_POWER default 0 -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features" -source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults" -source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features" +source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults" +source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig" source "Kconfig.zephyr" diff --git a/samples/net/aws_iot/Kconfig b/samples/net/aws_iot/Kconfig index 60b205a04fcb..e372d5d27860 100644 --- a/samples/net/aws_iot/Kconfig +++ b/samples/net/aws_iot/Kconfig @@ -33,7 +33,7 @@ config AWS_IOT_SAMPLE_DEVICE_ID_USE_HW_ID module = AWS_IOT_SAMPLE module-str = AWS IoT sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu diff --git a/samples/net/azure_iot_hub/Kconfig b/samples/net/azure_iot_hub/Kconfig index c9d9de323af0..c3d505b964f0 100644 --- a/samples/net/azure_iot_hub/Kconfig +++ b/samples/net/azure_iot_hub/Kconfig @@ -12,7 +12,7 @@ endmenu module = AZURE_IOT_HUB_SAMPLE module-str = Azure IoT Hub sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config AZURE_IOT_HUB_SAMPLE_DEVICE_ID_USE_HW_ID bool "Use HW ID as device ID" diff --git a/samples/net/coap_client/Kconfig b/samples/net/coap_client/Kconfig index 5c1df5c47dce..57e8023cc0ed 100644 --- a/samples/net/coap_client/Kconfig +++ b/samples/net/coap_client/Kconfig @@ -30,4 +30,4 @@ endmenu module = COAP_CLIENT_SAMPLE module-str = CoAP client sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/net/http_server/Kconfig b/samples/net/http_server/Kconfig index 2319b279246c..ebe3acaa600e 100644 --- a/samples/net/http_server/Kconfig +++ b/samples/net/http_server/Kconfig @@ -49,7 +49,7 @@ config HTTP_SERVER_SAMPLE_RECEIVE_BUFFER_SIZE module = HTTP_SERVER_SAMPLE module-str = HTTP server sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/net/udp/Kconfig b/samples/net/udp/Kconfig index 2475bd2b6a5c..b9acc4f4c89c 100644 --- a/samples/net/udp/Kconfig +++ b/samples/net/udp/Kconfig @@ -26,7 +26,7 @@ endmenu module = UDP_SAMPLE module-str = UDP sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" menu "Zephyr Kernel" source "Kconfig.zephyr" diff --git a/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild b/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild index 28679c4dc730..86f788be25ed 100644 --- a/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild +++ b/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild @@ -30,7 +30,7 @@ config NETCORE_IMAGE_NAME default "remote" if NETCORE_REMOTE config NETCORE_IMAGE_PATH - default "${APP_DIR}/remote" if NETCORE_REMOTE + default "$(APP_DIR)/remote" if NETCORE_REMOTE endif # !NETCORE_NONE diff --git a/samples/nrf_rpc/protocols_serialization/client/Kconfig b/samples/nrf_rpc/protocols_serialization/client/Kconfig index 086c0d1b771d..fdab9ea98bd2 100644 --- a/samples/nrf_rpc/protocols_serialization/client/Kconfig +++ b/samples/nrf_rpc/protocols_serialization/client/Kconfig @@ -16,7 +16,7 @@ config NRF_PS_CLIENT_CRASH_DUMP_READ_BUFFER_SIZE module = NRF_PS_CLIENT module-str = nrf_ps_client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config NRF_PS_CLIENT_BT_TEST bool "BLE test service for RPC Client" diff --git a/samples/nrf_rpc/protocols_serialization/server/Kconfig b/samples/nrf_rpc/protocols_serialization/server/Kconfig index cf6e2652a17c..de228fa973cf 100644 --- a/samples/nrf_rpc/protocols_serialization/server/Kconfig +++ b/samples/nrf_rpc/protocols_serialization/server/Kconfig @@ -26,7 +26,7 @@ config NRF_PS_SERVER_RPC_ALIVE_LED module = NRF_PS_SERVER module-str = nrf_ps_server -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu # "Protocols serialization server" diff --git a/samples/openthread/cli/Kconfig b/samples/openthread/cli/Kconfig index c74fa8355d59..105286d4825e 100644 --- a/samples/openthread/cli/Kconfig +++ b/samples/openthread/cli/Kconfig @@ -10,7 +10,7 @@ endmenu module = OT_COMMAND_LINE_INTERFACE module-str = ot_cli -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config CLI_SAMPLE_LOW_POWER bool "Enable low power mode for the CLI sample" diff --git a/samples/openthread/coap_client/Kconfig b/samples/openthread/coap_client/Kconfig index 56ce158d7406..75b5ed35df72 100644 --- a/samples/openthread/coap_client/Kconfig +++ b/samples/openthread/coap_client/Kconfig @@ -10,12 +10,12 @@ endmenu module = COAP_CLIENT module-str = CoAP client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" module = COAP_CLIENT_UTILS module-str = CoAP client utilities -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" module = BLE_UTILS module-str = Bluetooth connection utilities -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/openthread/coap_server/Kconfig b/samples/openthread/coap_server/Kconfig index 585cadd73926..2966a59cbab4 100644 --- a/samples/openthread/coap_server/Kconfig +++ b/samples/openthread/coap_server/Kconfig @@ -10,8 +10,8 @@ endmenu module = COAP_SERVER module-str = CoAP server -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" module = OT_COAP_UTILS module-str = OpenThread CoAP utils -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/samples/openthread/coprocessor/Kconfig b/samples/openthread/coprocessor/Kconfig index bb7477dd8729..961c20123331 100644 --- a/samples/openthread/coprocessor/Kconfig +++ b/samples/openthread/coprocessor/Kconfig @@ -10,7 +10,7 @@ endmenu module = OT_COPROCESSOR module-str = ot_coprocessor -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config RCP_SAMPLE_HCI bool "Enable Bluetooth HCI USB support for the coprocessor sample" diff --git a/samples/wifi/provisioning/internal/Kconfig b/samples/wifi/provisioning/internal/Kconfig index e12da1a18ba1..ab7edce5b648 100644 --- a/samples/wifi/provisioning/internal/Kconfig +++ b/samples/wifi/provisioning/internal/Kconfig @@ -140,6 +140,6 @@ config WIFI_PROV_MAX_BASE64_SIZE module = WIFI_PROV_INTERNAL module-dep = LOG module-str = Log level for sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" source "Kconfig.zephyr" diff --git a/samples/wifi/provisioning/softap/Kconfig b/samples/wifi/provisioning/softap/Kconfig index 1776357448ba..9c5ceccec5cc 100644 --- a/samples/wifi/provisioning/softap/Kconfig +++ b/samples/wifi/provisioning/softap/Kconfig @@ -21,6 +21,6 @@ endmenu module = SOFTAP_WIFI_PROVISION_SAMPLE module-str = SoftAP Wi-Fi provision sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu diff --git a/samples/wifi/radio_test/multi_domain/Kconfig.sysbuild b/samples/wifi/radio_test/multi_domain/Kconfig.sysbuild index 29bb20431ceb..16d783ed236f 100644 --- a/samples/wifi/radio_test/multi_domain/Kconfig.sysbuild +++ b/samples/wifi/radio_test/multi_domain/Kconfig.sysbuild @@ -29,7 +29,7 @@ config NETCORE_IMAGE_NAME default "peripheral_radio_test" if NETCORE_PERIPHERAL_RADIO_TEST config NETCORE_IMAGE_PATH - default "${ZEPHYR_NRF_MODULE_DIR}/samples/peripheral/radio_test/" if NETCORE_PERIPHERAL_RADIO_TEST + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/peripheral/radio_test/" if NETCORE_PERIPHERAL_RADIO_TEST endif # !NETCORE_NONE diff --git a/samples/wifi/twt/modules/traffic_gen/Kconfig b/samples/wifi/twt/modules/traffic_gen/Kconfig index ae517d5e7b9d..b98e57ce4d6f 100644 --- a/samples/wifi/twt/modules/traffic_gen/Kconfig +++ b/samples/wifi/twt/modules/traffic_gen/Kconfig @@ -57,4 +57,4 @@ config TRAFFIC_GEN_TYPE_TCP module = TRAFFIC_GEN module-dep = LOG module-str = Log level for sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 652fb09fd549..de8bef1fa29c 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -209,6 +209,10 @@ - nrf9160dk@0.14.0/nrf9160 comment: "https://nordicsemi.atlassian.net/browse/NRFX-8152" +- scenarios: + - testing.ctest.base + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35402" + # --------------------------------- Won't fix section ----------------------------------- - scenarios: @@ -516,3 +520,7 @@ platforms: - nrf52840dk/nrf52840 comment: "Not compatible with NCS. https://nordicsemi.atlassian.net/browse/KRKNWK-20183" + +- scenarios: + - buildsystem.sbom.spdx + comment: "Missing toolchain python package. https://nordicsemi.atlassian.net/browse/NCSDK-35387" diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index 9af897be18ae..32166e6ab58a 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -14,3 +14,4 @@ nrf-regtool==9.2.1 windows-curses; sys_platform == 'win32' unidiff pycryptodome==3.21.0 +python-dotenv diff --git a/scripts/requirements-ci.txt b/scripts/requirements-ci.txt index 749a98bdfd42..e02fc4fde64a 100644 --- a/scripts/requirements-ci.txt +++ b/scripts/requirements-ci.txt @@ -14,3 +14,4 @@ qrcode stringcase==1.2.0 toml wget +python-dotenv diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index e914a3769bb9..e495f279fbfa 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -15,9 +15,9 @@ attrs==25.3.0 ; python_version >= "3.12" and python_version < "4.0" banal==1.0.6 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" beautifulsoup4==4.13.4 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" beautifulsoup4[chardet]==4.13.4 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" -binaryornot==0.4.4 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +binaryornot==0.4.4 ; python_version >= "3.12" and python_version < "4.0" bitarray==3.6.0 ; python_version >= "3.12" and python_version < "4.0" -boolean-py==4.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +boolean-py==4.0 ; python_version >= "3.12" and python_version < "4.0" canopen==2.3.0 ; python_version >= "3.12" and python_version < "4.0" capstone==4.0.2 ; python_version >= "3.12" and python_version < "4.0" cbor2==5.6.5 ; python_version >= "3.12" and python_version < "4.0" @@ -61,7 +61,7 @@ graphviz==0.20.3 ; python_version >= "3.12" and python_version < "4.0" grpcio-tools==1.66.1 ; python_version >= "3.12" and python_version < "4.0" grpcio==1.73.0 ; python_version >= "3.12" and python_version < "4.0" hidapi==0.14.0.post4 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Linux" -html5lib-modern==1.2 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +html5lib-modern==1.2 ; python_version >= "3.12" and python_version < "4.0" html5lib==1.1 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" humanfriendly==10.0 ; python_version >= "3.12" and python_version < "4.0" idna==3.10 ; python_version >= "3.12" and python_version < "4.0" @@ -80,18 +80,17 @@ jsonschema-specifications==2025.4.1 ; python_version >= "3.12" and python_versio jsonschema==4.24.0 ; python_version >= "3.12" and python_version < "4.0" jsonstreams==0.6.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" junit2html==31.0.2 ; python_version >= "3.12" and python_version < "4.0" -junitparser==3.2.0 ; python_version >= "3.12" and python_version < "4.0" +junitparser==4.0.2 ; python_version >= "3.12" and python_version < "4.0" lark==1.2.2 ; python_version >= "3.12" and python_version < "4.0" libusb-package==1.0.26.1 ; python_version >= "3.12" and python_version < "4.0" libusb==1.0.28.post2 ; python_version >= "3.12" and python_version < "4.0" -license-expression==30.3.1 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +license-expression==30.3.1 ; python_version >= "3.12" and python_version < "4.0" lpc-checksum==3.0.0 ; python_version >= "3.12" and python_version < "4.0" lxml==5.4.0 ; python_version >= "3.12" and python_version < "4.0" markupsafe==3.0.2 ; python_version >= "3.12" and python_version < "4.0" matter-idl==1.0.0 ; python_version >= "3.12" and python_version < "4.0" mccabe==0.7.0 ; python_version >= "3.12" and python_version < "4.0" milksnake==0.1.6 ; python_version >= "3.12" and python_version < "4.0" -mock==5.1.0 ; python_version >= "3.12" and python_version < "4.0" more-itertools==10.7.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" msgpack==1.0.5 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Windows" mypy-extensions==1.1.0 ; python_version >= "3.12" and python_version < "4.0" @@ -119,7 +118,6 @@ plugincode==32.0.0 ; python_version >= "3.12" and python_version < "4.0" and pla ply==3.11 ; python_version >= "3.12" and python_version < "4.0" polib==1.2.0 ; python_version >= "3.12" and python_version < "4.0" prettytable==3.16.0 ; python_version >= "3.12" and python_version < "4.0" -progress==1.6 ; python_version >= "3.12" and python_version < "4.0" protobuf==5.29.5 ; python_version >= "3.12" and python_version < "4.0" psutil==7.0.0 ; python_version >= "3.12" and python_version < "4.0" publicsuffix2==2.20191221 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" @@ -145,6 +143,8 @@ pyserial==3.5 ; python_version >= "3.12" and python_version < "4.0" pytest==8.4.0 ; python_version >= "3.12" and python_version < "4.0" python-can==4.4.2 ; python_version >= "3.12" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0" +python-debian==1.0.1 ; python_version >= "3.12" and python_version < "4.0" +python-dotenv==1.1.1 ; python_version >= "3.12" and python_version < "4.0" python-magic-bin==0.4.14 ; python_version >= "3.12" and python_version < "4.0" and sys_platform == "win32" python-magic==0.4.27 ; python_version >= "3.12" and python_version < "4.0" and sys_platform != "win32" python-stdnum==2.1 ; python_version >= "3.12" and python_version < "4.0" @@ -153,11 +153,12 @@ pyusb==1.3.1 ; python_version >= "3.12" and python_version < "4.0" pywin32==306 ; platform_system == "Windows" and platform_python_implementation == "CPython" and python_version >= "3.12" and python_version < "4.0" pyyaml==6.0.2 ; python_version >= "3.12" and python_version < "4.0" qrcode==8.2 ; python_version >= "3.12" and python_version < "4.0" -rdflib==7.1.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +rdflib==7.1.0 ; python_version >= "3.12" and python_version < "4.0" referencing==0.36.2 ; python_version >= "3.12" and python_version < "4.0" regex==2024.11.6 ; python_version >= "3.12" and python_version < "4.0" requests==2.32.4 ; python_version >= "3.12" and python_version < "4.0" requests[use-chardet-on-py3]==2.32.4 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +reuse==5.0.2 ; python_version >= "3.12" and python_version < "4.0" rpds-py==0.26.0 ; python_version >= "3.12" and python_version < "4.0" ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.12" ruamel-yaml==0.18.6 ; python_version >= "3.12" and python_version < "4.0" @@ -171,7 +172,7 @@ six==1.17.0 ; python_version >= "3.12" and python_version < "4.0" smmap==5.0.2 ; python_version >= "3.12" and python_version < "4.0" sortedcontainers==2.4.0 ; python_version >= "3.12" and python_version < "4.0" soupsieve==2.7 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" -spdx-tools==0.7.0a3 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +spdx-tools==0.7.0a3 ; python_version >= "3.12" and python_version < "4.0" sphinx-lint==1.0.0 ; python_version >= "3.12" and python_version < "4.0" stringcase==1.2.0 ; python_version >= "3.12" and python_version < "4.0" svada==2.2.0 ; python_version >= "3.12" and python_version < "4.0" @@ -187,13 +188,14 @@ typing-extensions==4.14.1 ; python_version >= "3.12" and python_version < "4.0" unidiff==0.7.5 ; python_version >= "3.12" and python_version < "4.0" urllib3==2.5.0 ; python_version >= "3.12" and python_version < "4.0" urlpy==0.5 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +vermin==1.6.0 ; python_version >= "3.12" and python_version < "4.0" wcwidth==0.2.13 ; python_version >= "3.12" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" west==1.4.0 ; python_version >= "3.12" and python_version < "4.0" wget==3.2 ; python_version >= "3.12" and python_version < "4.0" windows-curses==2.4.0 ; python_version >= "3.12" and python_version < "4.0" and sys_platform == "win32" wrapt==1.17.2 ; python_version >= "3.12" and python_version < "4.0" -xmltodict==0.14.2 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64" +xmltodict==0.14.2 ; python_version >= "3.12" and python_version < "4.0" yamllint==1.35.1 ; python_version >= "3.12" and python_version < "4.0" zcbor==0.8.1 ; python_version >= "3.12" and python_version < "4.0" zipp==3.23.0 ; python_version >= "3.12" and python_version < "4.0" diff --git a/subsys/app_event_manager/Kconfig b/subsys/app_event_manager/Kconfig index 0cf77e43cc8c..40193bfd46ce 100644 --- a/subsys/app_event_manager/Kconfig +++ b/subsys/app_event_manager/Kconfig @@ -51,7 +51,7 @@ config APP_EVENT_MANAGER_SHELL module = APP_EVENT_MANAGER module-str = Application Event Manager -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config APP_EVENT_MANAGER_EVENT_LOG_BUF_LEN int "Length of buffer for processing event message" diff --git a/subsys/bluetooth/Kconfig.discovery b/subsys/bluetooth/Kconfig.discovery index 0d97c13c81a7..8a70621f0a4f 100644 --- a/subsys/bluetooth/Kconfig.discovery +++ b/subsys/bluetooth/Kconfig.discovery @@ -70,6 +70,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BT_GATT_DM module = BT_GATT_DM module-str = GATT database discovery -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_GATT_DM diff --git a/subsys/bluetooth/Kconfig.enocean b/subsys/bluetooth/Kconfig.enocean index 3a3da67bda65..4526594d5716 100644 --- a/subsys/bluetooth/Kconfig.enocean +++ b/subsys/bluetooth/Kconfig.enocean @@ -61,6 +61,6 @@ endif module = BT_ENOCEAN module-str = EnOcean library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/subsys/bluetooth/Kconfig.link b/subsys/bluetooth/Kconfig.link index e00a055676be..494f5317511d 100644 --- a/subsys/bluetooth/Kconfig.link +++ b/subsys/bluetooth/Kconfig.link @@ -23,6 +23,6 @@ config BT_CONN_CTX_MEM_BUF_ALIGN module = BT_CONN_CTX module-str = connection context library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_CONN_CTX diff --git a/subsys/bluetooth/Kconfig.pool b/subsys/bluetooth/Kconfig.pool index 43fb4b883444..2a5e615ff30e 100644 --- a/subsys/bluetooth/Kconfig.pool +++ b/subsys/bluetooth/Kconfig.pool @@ -48,6 +48,6 @@ config BT_GATT_POOL_STATS module = BT_GATT_POOL module-str = GATT_POOL -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_GATT_POOL diff --git a/subsys/bluetooth/Kconfig.scan b/subsys/bluetooth/Kconfig.scan index 2ebd862d3014..68d2ef0819c5 100644 --- a/subsys/bluetooth/Kconfig.scan +++ b/subsys/bluetooth/Kconfig.scan @@ -156,6 +156,6 @@ endif # BT_SCAN_BLOCKLIST module = BT_SCAN module-str = scan library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_SCAN diff --git a/subsys/bluetooth/adv_prov/Kconfig b/subsys/bluetooth/adv_prov/Kconfig index 275c0b8f502b..51b67c111c49 100644 --- a/subsys/bluetooth/adv_prov/Kconfig +++ b/subsys/bluetooth/adv_prov/Kconfig @@ -16,7 +16,7 @@ if BT_ADV_PROV module = BT_ADV_PROV module-str = Bluetooth LE advertising providers -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" rsource "providers/Kconfig" diff --git a/subsys/bluetooth/cs_de/Kconfig b/subsys/bluetooth/cs_de/Kconfig index 8577c1ca65d9..62d2c2b8befd 100644 --- a/subsys/bluetooth/cs_de/Kconfig +++ b/subsys/bluetooth/cs_de/Kconfig @@ -21,7 +21,7 @@ if BT_CS_DE module = BT_CS_DE module-str = CS_DE -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config BT_CS_DE_NFFT_SIZE int diff --git a/subsys/bluetooth/mesh/Kconfig.dk_prov b/subsys/bluetooth/mesh/Kconfig.dk_prov index 216e8cce9c99..a8d0cacef72b 100644 --- a/subsys/bluetooth/mesh/Kconfig.dk_prov +++ b/subsys/bluetooth/mesh/Kconfig.dk_prov @@ -38,6 +38,6 @@ config BT_MESH_DK_LEGACY_UUID_GEN module = BT_MESH_DK_PROV module-str = DK BT mesh provisioning library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_MESH_DK_PROV diff --git a/subsys/bluetooth/rpc/Kconfig b/subsys/bluetooth/rpc/Kconfig index 5bde86589435..2b5487120fa7 100644 --- a/subsys/bluetooth/rpc/Kconfig +++ b/subsys/bluetooth/rpc/Kconfig @@ -65,7 +65,7 @@ config BT_RPC_GATT_SRV_MAX module = BT_RPC module-str = BLE over nRF RPC -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if BT_RPC_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.ams_client b/subsys/bluetooth/services/Kconfig.ams_client index 1136bdd701a1..399af8c0f1a0 100644 --- a/subsys/bluetooth/services/Kconfig.ams_client +++ b/subsys/bluetooth/services/Kconfig.ams_client @@ -14,6 +14,6 @@ if BT_AMS_CLIENT module = BT_AMS_CLIENT module-str = AMS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_AMS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.ancs_client b/subsys/bluetooth/services/Kconfig.ancs_client index e547d2773815..ac46f51f5831 100644 --- a/subsys/bluetooth/services/Kconfig.ancs_client +++ b/subsys/bluetooth/services/Kconfig.ancs_client @@ -21,6 +21,6 @@ config BT_ANCS_CLIENT_CP_BUFF_SIZE module = BT_ANCS_CLIENT module-str = ANCS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_ANCS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.bas_client b/subsys/bluetooth/services/Kconfig.bas_client index 1975ec29312d..6c98f174dd18 100644 --- a/subsys/bluetooth/services/Kconfig.bas_client +++ b/subsys/bluetooth/services/Kconfig.bas_client @@ -14,6 +14,6 @@ if BT_BAS_CLIENT module = BT_BAS_CLIENT module-str = BAS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_BAS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.bms b/subsys/bluetooth/services/Kconfig.bms index 733c149d648a..5667df17aea1 100644 --- a/subsys/bluetooth/services/Kconfig.bms +++ b/subsys/bluetooth/services/Kconfig.bms @@ -13,6 +13,6 @@ if BT_BMS module = BT_BMS module-str = BMS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_BMS diff --git a/subsys/bluetooth/services/Kconfig.cts_client b/subsys/bluetooth/services/Kconfig.cts_client index 2b97a6965517..24ae1af30ae9 100644 --- a/subsys/bluetooth/services/Kconfig.cts_client +++ b/subsys/bluetooth/services/Kconfig.cts_client @@ -14,6 +14,6 @@ if BT_CTS_CLIENT module = BT_CTS_CLIENT module-str = CTS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_CTS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.ddfs b/subsys/bluetooth/services/Kconfig.ddfs index 8cc7fc42dde8..fb5ec91ee344 100644 --- a/subsys/bluetooth/services/Kconfig.ddfs +++ b/subsys/bluetooth/services/Kconfig.ddfs @@ -15,6 +15,6 @@ if BT_DDFS module = BT_DDFS module-str = DDFS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_DDFS diff --git a/subsys/bluetooth/services/Kconfig.dfu_smp b/subsys/bluetooth/services/Kconfig.dfu_smp index 2551512a1151..14537c28ec95 100644 --- a/subsys/bluetooth/services/Kconfig.dfu_smp +++ b/subsys/bluetooth/services/Kconfig.dfu_smp @@ -14,6 +14,6 @@ if BT_DFU_SMP module = BT_DFU_SMP module-str = DFU SMP Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_DFU_SMP diff --git a/subsys/bluetooth/services/Kconfig.gattp b/subsys/bluetooth/services/Kconfig.gattp index 4775b6bdc7a8..f4a8e62dd96f 100644 --- a/subsys/bluetooth/services/Kconfig.gattp +++ b/subsys/bluetooth/services/Kconfig.gattp @@ -15,6 +15,6 @@ if BT_GATTP module = BT_GATTP module-str = GATT Profile -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_GATTP diff --git a/subsys/bluetooth/services/Kconfig.hids b/subsys/bluetooth/services/Kconfig.hids index b8f456e33526..ea55e30fccd6 100644 --- a/subsys/bluetooth/services/Kconfig.hids +++ b/subsys/bluetooth/services/Kconfig.hids @@ -70,6 +70,6 @@ endchoice module = BT_HIDS module-str = HIDS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_HIDS diff --git a/subsys/bluetooth/services/Kconfig.hogp b/subsys/bluetooth/services/Kconfig.hogp index 76f23e3416bd..999fec31554c 100644 --- a/subsys/bluetooth/services/Kconfig.hogp +++ b/subsys/bluetooth/services/Kconfig.hogp @@ -14,7 +14,7 @@ if BT_HOGP module = BT_HOGP module-str = HIDS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config BT_HOGP_REPORTS_MAX int "Maximum number of reports supported" diff --git a/subsys/bluetooth/services/Kconfig.hrs_client b/subsys/bluetooth/services/Kconfig.hrs_client index 27c8970330fa..3ab069811071 100644 --- a/subsys/bluetooth/services/Kconfig.hrs_client +++ b/subsys/bluetooth/services/Kconfig.hrs_client @@ -22,6 +22,6 @@ config BT_HRS_CLIENT_RR_INTERVALS_COUNT module = BT_HRS_CLIENT module-str = HRS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_HRS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.latency b/subsys/bluetooth/services/Kconfig.latency index 469b06fb9066..4d4d46f612ce 100644 --- a/subsys/bluetooth/services/Kconfig.latency +++ b/subsys/bluetooth/services/Kconfig.latency @@ -14,6 +14,6 @@ if BT_LATENCY module = BT_LATENCY module-str = LATENCY -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_LATENCY diff --git a/subsys/bluetooth/services/Kconfig.latency_c b/subsys/bluetooth/services/Kconfig.latency_c index 953f45f9720b..ff76a84f6df4 100644 --- a/subsys/bluetooth/services/Kconfig.latency_c +++ b/subsys/bluetooth/services/Kconfig.latency_c @@ -16,6 +16,6 @@ if BT_LATENCY_CLIENT module = BT_LATENCY_CLIENT module-str = LATENCY Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_LATENCY_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.lbs b/subsys/bluetooth/services/Kconfig.lbs index 39c6f8b83973..d6737c29a6f8 100644 --- a/subsys/bluetooth/services/Kconfig.lbs +++ b/subsys/bluetooth/services/Kconfig.lbs @@ -22,6 +22,6 @@ config BT_LBS_POLL_BUTTON module = BT_LBS module-str = LBS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_LBS diff --git a/subsys/bluetooth/services/Kconfig.mds b/subsys/bluetooth/services/Kconfig.mds index bee64d266f33..a66a4d6bfac7 100644 --- a/subsys/bluetooth/services/Kconfig.mds +++ b/subsys/bluetooth/services/Kconfig.mds @@ -56,6 +56,6 @@ config BT_MDS_DATA_POLL_INTERVAL module = BT_MDS module-str = MDS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_MDS diff --git a/subsys/bluetooth/services/Kconfig.nsms b/subsys/bluetooth/services/Kconfig.nsms index 7b6e08722191..9e637c90aede 100644 --- a/subsys/bluetooth/services/Kconfig.nsms +++ b/subsys/bluetooth/services/Kconfig.nsms @@ -14,6 +14,6 @@ if BT_NSMS module = BT_NSMS module-str = NSMS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_NSMS diff --git a/subsys/bluetooth/services/Kconfig.nus b/subsys/bluetooth/services/Kconfig.nus index 7e0771a80a9d..8fd6cf116150 100644 --- a/subsys/bluetooth/services/Kconfig.nus +++ b/subsys/bluetooth/services/Kconfig.nus @@ -19,6 +19,6 @@ config BT_NUS_AUTHEN module = BT_NUS module-str = NUS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_NUS diff --git a/subsys/bluetooth/services/Kconfig.nus_client b/subsys/bluetooth/services/Kconfig.nus_client index 28c448c7d94c..1f0f16354330 100644 --- a/subsys/bluetooth/services/Kconfig.nus_client +++ b/subsys/bluetooth/services/Kconfig.nus_client @@ -14,6 +14,6 @@ if BT_NUS_CLIENT module = BT_NUS_CLIENT module-str = NUS Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_NUS_CLIENT diff --git a/subsys/bluetooth/services/Kconfig.rscs b/subsys/bluetooth/services/Kconfig.rscs index d1024a4975ab..a0c2211b4720 100644 --- a/subsys/bluetooth/services/Kconfig.rscs +++ b/subsys/bluetooth/services/Kconfig.rscs @@ -14,6 +14,6 @@ if BT_RSCS module = BT_RSCS module-str = RSCS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_RSCS diff --git a/subsys/bluetooth/services/Kconfig.throughput b/subsys/bluetooth/services/Kconfig.throughput index 2a160447e75d..102af959940d 100644 --- a/subsys/bluetooth/services/Kconfig.throughput +++ b/subsys/bluetooth/services/Kconfig.throughput @@ -14,6 +14,6 @@ if BT_THROUGHPUT module = BT_THROUGHPUT module-str = THROUGHPUT -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_THROUGHPUT diff --git a/subsys/bluetooth/services/cgms/Kconfig.cgms b/subsys/bluetooth/services/cgms/Kconfig.cgms index a0099026c77c..f773c60e84ed 100644 --- a/subsys/bluetooth/services/cgms/Kconfig.cgms +++ b/subsys/bluetooth/services/cgms/Kconfig.cgms @@ -21,6 +21,6 @@ config BT_CGMS_MAX_MEASUREMENT_RECORD module = BT_CGMS module-str = CGMS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_CGMS diff --git a/subsys/bluetooth/services/fast_pair/Kconfig.fast_pair b/subsys/bluetooth/services/fast_pair/Kconfig.fast_pair index 0f44aa4bb69e..2bd64df88756 100644 --- a/subsys/bluetooth/services/fast_pair/Kconfig.fast_pair +++ b/subsys/bluetooth/services/fast_pair/Kconfig.fast_pair @@ -199,6 +199,6 @@ config BT_FAST_PAIR_BOND_MANAGER module = BT_FAST_PAIR module-str = Fast Pair Service -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_FAST_PAIR diff --git a/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto b/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto index 1e0fed4e677f..48829c8407d5 100644 --- a/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto +++ b/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto @@ -72,6 +72,6 @@ config BT_FAST_PAIR_CRYPTO_SECP256R1_SUPPORT module = FP_CRYPTO module-str = Fast Pair crypto library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_FAST_PAIR_CRYPTO diff --git a/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage b/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage index 17b586336716..1785dbfce973 100644 --- a/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage +++ b/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage @@ -120,6 +120,6 @@ config BT_FAST_PAIR_STORAGE_FMDN_EIK module = FP_STORAGE module-str = Fast Pair storage library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_FAST_PAIR_STORAGE diff --git a/subsys/bluetooth/services/ras/rreq/Kconfig.ras_rreq b/subsys/bluetooth/services/ras/rreq/Kconfig.ras_rreq index 12460111e8ce..d1d6be3ab533 100644 --- a/subsys/bluetooth/services/ras/rreq/Kconfig.ras_rreq +++ b/subsys/bluetooth/services/ras/rreq/Kconfig.ras_rreq @@ -13,7 +13,7 @@ if BT_RAS_RREQ module = BT_RAS_RREQ module-str = RAS_RREQ -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config BT_RAS_RREQ_MAX_ACTIVE_CONN int "Number of simultaneously supported RREQ instances" diff --git a/subsys/bluetooth/services/ras/rrsp/Kconfig.ras_rrsp b/subsys/bluetooth/services/ras/rrsp/Kconfig.ras_rrsp index 7a405598bd76..63af556c0992 100644 --- a/subsys/bluetooth/services/ras/rrsp/Kconfig.ras_rrsp +++ b/subsys/bluetooth/services/ras/rrsp/Kconfig.ras_rrsp @@ -31,6 +31,6 @@ config BT_RAS_RRSP_RD_BUFFERS_PER_CONN module = BT_RAS_RRSP module-str = RAS_RRSP -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_RAS_RRSP diff --git a/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov b/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov index 53f8c131a1c0..97787703ca26 100644 --- a/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov +++ b/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov @@ -14,6 +14,6 @@ if BT_WIFI_PROV module = BT_WIFI_PROV module-str = WIFI_PROV -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # BT_WIFI_PROV diff --git a/subsys/bootloader/bl_crypto/Kconfig b/subsys/bootloader/bl_crypto/Kconfig index 90fc14b7c9aa..d608f2fa4116 100644 --- a/subsys/bootloader/bl_crypto/Kconfig +++ b/subsys/bootloader/bl_crypto/Kconfig @@ -181,14 +181,14 @@ EXT_API = BL_ROT_VERIFY id = 0x1001 flags = 2 ver = 1 -source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" if SB_SHA256 EXT_API = BL_SHA256 id = 0x1002 flags = 0 ver = 1 -source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" endif if SB_ECDSA_SECP256R1 @@ -196,7 +196,7 @@ EXT_API = BL_SECP256R1 id = 0x1003 flags = 1 ver = 1 -source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" endif module = SB_CRYPTO diff --git a/subsys/bootloader/bl_validation/Kconfig b/subsys/bootloader/bl_validation/Kconfig index 011845f91c2f..b30aa09d4361 100644 --- a/subsys/bootloader/bl_validation/Kconfig +++ b/subsys/bootloader/bl_validation/Kconfig @@ -69,7 +69,7 @@ EXT_API = BL_VALIDATE_FW id = 0x1101 flags = 3 ver = 1 -source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" endif # SECURE_BOOT_VALIDATION diff --git a/subsys/debug/cpu_load/Kconfig b/subsys/debug/cpu_load/Kconfig index aab37f4b1e22..6cfa5e84fea1 100644 --- a/subsys/debug/cpu_load/Kconfig +++ b/subsys/debug/cpu_load/Kconfig @@ -19,7 +19,7 @@ if NRF_CPU_LOAD module = NRF_CPU_LOAD module-str = CPU load measurement -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config NRF_CPU_LOAD_CMDS bool "Enable shell commands" diff --git a/subsys/debug/ppi_trace/Kconfig b/subsys/debug/ppi_trace/Kconfig index 88c89baf96c2..14036d910be3 100644 --- a/subsys/debug/ppi_trace/Kconfig +++ b/subsys/debug/ppi_trace/Kconfig @@ -21,6 +21,6 @@ config PPI_TRACE if PPI_TRACE module = PPI_TRACE module-str = PPI trace -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # PPI_TRACE diff --git a/subsys/dfu/dfu_target/Kconfig b/subsys/dfu/dfu_target/Kconfig index 28ffeab7a820..5745d0bcbbfe 100644 --- a/subsys/dfu/dfu_target/Kconfig +++ b/subsys/dfu/dfu_target/Kconfig @@ -130,6 +130,6 @@ config DFU_TARGET_CUSTOM module=DFU_TARGET module-dep=LOG module-str=Device Firmware Upgrade -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # DFU_TARGET diff --git a/subsys/dfu/fmfu_fdev/Kconfig b/subsys/dfu/fmfu_fdev/Kconfig index 09a548ad47a9..9c0a424eb3e5 100644 --- a/subsys/dfu/fmfu_fdev/Kconfig +++ b/subsys/dfu/fmfu_fdev/Kconfig @@ -38,6 +38,6 @@ endif module=FMFU_FDEV module-dep=LOG module-str=FMFU FDEV -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # FMFU_FDEV diff --git a/subsys/dm/Kconfig b/subsys/dm/Kconfig index 89453e484e44..a68f11be327d 100644 --- a/subsys/dm/Kconfig +++ b/subsys/dm/Kconfig @@ -68,7 +68,7 @@ config DM_TIMESLOT_QUEUE_COUNT_SAME_PEER module = DM_MODULE module-str = DM_MODULE -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #DM_MODULE diff --git a/subsys/dult/Kconfig b/subsys/dult/Kconfig index d11ced28d3b2..d1667f3721be 100644 --- a/subsys/dult/Kconfig +++ b/subsys/dult/Kconfig @@ -213,6 +213,6 @@ endif # DULT_MOTION_DETECTOR module = DULT module-str = DULT -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # DULT diff --git a/subsys/emds/Kconfig b/subsys/emds/Kconfig index 9e1deda2d94b..8083b8e0519f 100644 --- a/subsys/emds/Kconfig +++ b/subsys/emds/Kconfig @@ -66,6 +66,6 @@ config EMDS_CHUNK_PREPARATION_TIME_US module = EMDS module-str = emergency data storage -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # EMDS diff --git a/subsys/esb/Kconfig b/subsys/esb/Kconfig index 44edf81a75d2..32f76a3f9cec 100644 --- a/subsys/esb/Kconfig +++ b/subsys/esb/Kconfig @@ -174,6 +174,6 @@ config ESB_FAST_CHANNEL_SWITCHING module=ESB module-str=ESB -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NRF_ENHANCED_SHOCKBURST diff --git a/subsys/fw_info/Kconfig b/subsys/fw_info/Kconfig index 536e2d3657ff..898feb4870c5 100644 --- a/subsys/fw_info/Kconfig +++ b/subsys/fw_info/Kconfig @@ -127,7 +127,7 @@ EXT_API = EXT_API_PROVIDE id = 0x1200 flags = 0 ver = 1 -source "${ZEPHYR_BASE}/../nrf/subsys/fw_info/Kconfig.template.fw_info_ext_api" +source "$(ZEPHYR_NRF_MODULE_DIR)/subsys/fw_info/Kconfig.template.fw_info_ext_api" config EXT_API_PROVIDE_EXT_API_ATLEAST_OPTIONAL bool "Set the PROVIDE EXT_API as at least optional" diff --git a/subsys/mgmt/fmfu/Kconfig b/subsys/mgmt/fmfu/Kconfig index 2c2c10419512..acb1dc443339 100644 --- a/subsys/mgmt/fmfu/Kconfig +++ b/subsys/mgmt/fmfu/Kconfig @@ -17,7 +17,7 @@ if MGMT_FMFU module=MGMT_FMFU module-dep=LOG module-str=FMFU -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif endmenu diff --git a/subsys/mpsl/cx/Kconfig b/subsys/mpsl/cx/Kconfig index 27d4fbc5ca3c..2bc5fbbb14ed 100644 --- a/subsys/mpsl/cx/Kconfig +++ b/subsys/mpsl/cx/Kconfig @@ -131,6 +131,6 @@ endif # MPSL_CX_SOFTWARE module=MPSL_CX module-str=MPSL_CX -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MPSL_CX diff --git a/subsys/mpsl/fem/Kconfig b/subsys/mpsl/fem/Kconfig index 8048d8db7cf0..5971be968def 100644 --- a/subsys/mpsl/fem/Kconfig +++ b/subsys/mpsl/fem/Kconfig @@ -350,4 +350,4 @@ config MPSL_FEM_INIT_PRIORITY module=MPSL_FEM module-str=MPSL_FEM -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/subsys/mpsl/init/Kconfig b/subsys/mpsl/init/Kconfig index 554d148305ea..5f590fafa8e7 100644 --- a/subsys/mpsl/init/Kconfig +++ b/subsys/mpsl/init/Kconfig @@ -120,4 +120,4 @@ config MPSL_INIT_PRIORITY module=MPSL module-str=MPSL -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/subsys/net/lib/aws_fota/Kconfig b/subsys/net/lib/aws_fota/Kconfig index 252485fc29c7..7ba19cf718b5 100644 --- a/subsys/net/lib/aws_fota/Kconfig +++ b/subsys/net/lib/aws_fota/Kconfig @@ -27,6 +27,6 @@ module=AWS_FOTA module-dep=LOG module-str=Log level for AWS Jobs FOTA module-help=Enables AWS Jobs FOTA log messages. -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AWS_FOTA diff --git a/subsys/net/lib/aws_iot/Kconfig b/subsys/net/lib/aws_iot/Kconfig index a79f84d21edd..2b03fef93af7 100644 --- a/subsys/net/lib/aws_iot/Kconfig +++ b/subsys/net/lib/aws_iot/Kconfig @@ -59,6 +59,6 @@ config AWS_IOT_TOPIC_DELETE_REJECTED_SUBSCRIBE module = AWS_IOT module-dep = LOG module-str = AWS IoT -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AWS_IOT diff --git a/subsys/net/lib/aws_jobs/Kconfig b/subsys/net/lib/aws_jobs/Kconfig index 0ac637d94173..43974817ce7e 100644 --- a/subsys/net/lib/aws_jobs/Kconfig +++ b/subsys/net/lib/aws_jobs/Kconfig @@ -20,6 +20,6 @@ module=AWS_JOBS module-dep=LOG module-str=Log level for AWS Jobs module-help=Enables AWS Jobs log messages. -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AWS_JOBS diff --git a/subsys/net/lib/azure_fota/Kconfig b/subsys/net/lib/azure_fota/Kconfig index f9d826334e54..656a407b720c 100644 --- a/subsys/net/lib/azure_fota/Kconfig +++ b/subsys/net/lib/azure_fota/Kconfig @@ -61,6 +61,6 @@ module=AZURE_FOTA module-dep=LOG module-str=Log level for Azure FOTA module-help=Enables Azure FOTA log messages. -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AZURE_FOTA diff --git a/subsys/net/lib/azure_iot_hub/Kconfig b/subsys/net/lib/azure_iot_hub/Kconfig index 7a97aeaaecc1..5df867df7020 100644 --- a/subsys/net/lib/azure_iot_hub/Kconfig +++ b/subsys/net/lib/azure_iot_hub/Kconfig @@ -145,6 +145,6 @@ endif # AZURE_IOT_HUB_DPS module=AZURE_IOT_HUB module-dep=LOG module-str=Azure IoT Hub -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # AZURE_IOT_HUB diff --git a/subsys/net/lib/coap_utils/Kconfig b/subsys/net/lib/coap_utils/Kconfig index 57014128e9ca..110015091da5 100644 --- a/subsys/net/lib/coap_utils/Kconfig +++ b/subsys/net/lib/coap_utils/Kconfig @@ -14,6 +14,6 @@ if COAP_UTILS module = COAP_UTILS module-str = CoAP utils -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/subsys/net/lib/download_client/Kconfig b/subsys/net/lib/download_client/Kconfig index 6f3bb8328730..15bd1a611bba 100644 --- a/subsys/net/lib/download_client/Kconfig +++ b/subsys/net/lib/download_client/Kconfig @@ -149,7 +149,7 @@ config DOWNLOAD_CLIENT_SHELL module=DOWNLOAD_CLIENT module-dep=LOG module-str=Download client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if DOWNLOAD_CLIENT_LOG_LEVEL_DBG diff --git a/subsys/net/lib/downloader/Kconfig b/subsys/net/lib/downloader/Kconfig index d574f06137d6..c6d3909a6096 100644 --- a/subsys/net/lib/downloader/Kconfig +++ b/subsys/net/lib/downloader/Kconfig @@ -63,7 +63,7 @@ endif # DOWNLOADER_SHELL module=DOWNLOADER module-dep=LOG module-str=Download client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if DOWNLOADER_LOG_LEVEL_DBG diff --git a/subsys/net/lib/fota_download/Kconfig b/subsys/net/lib/fota_download/Kconfig index c43daa4c159a..21f438604fd3 100644 --- a/subsys/net/lib/fota_download/Kconfig +++ b/subsys/net/lib/fota_download/Kconfig @@ -69,6 +69,6 @@ config FOTA_DOWNLOAD_SEC_TAG_LIST_SIZE_MAX module=FOTA_DOWNLOAD module-dep=LOG module-str=Firmware Over the Air Download -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #FOTA_DOWNLOAD diff --git a/subsys/net/lib/ftp_client/Kconfig b/subsys/net/lib/ftp_client/Kconfig index 7efebaf01bf7..86a793c6b29e 100644 --- a/subsys/net/lib/ftp_client/Kconfig +++ b/subsys/net/lib/ftp_client/Kconfig @@ -26,7 +26,7 @@ config FTP_CLIENT_TLS module=FTP_CLIENT module-dep=LOG module-str=FTP client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if FTP_CLIENT_LOG_LEVEL_DBG diff --git a/subsys/net/lib/icalendar_parser/Kconfig b/subsys/net/lib/icalendar_parser/Kconfig index e7d2d9307e59..9fa0760c694a 100644 --- a/subsys/net/lib/icalendar_parser/Kconfig +++ b/subsys/net/lib/icalendar_parser/Kconfig @@ -47,6 +47,6 @@ config ICAL_PARSER_SUMMARY_SIZE module=ICAL_PARSER module-dep=LOG module-str=iCalendar parser -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/subsys/net/lib/lwm2m_client_utils/Kconfig b/subsys/net/lib/lwm2m_client_utils/Kconfig index 7cc000c1b09e..2eb6f997bf95 100644 --- a/subsys/net/lib/lwm2m_client_utils/Kconfig +++ b/subsys/net/lib/lwm2m_client_utils/Kconfig @@ -288,6 +288,6 @@ endif #LWM2M_DTLS_CID module = LWM2M_CLIENT_UTILS module-dep = LOG module-str = LwM2M client utilities library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # LWM2M_CLIENT_UTILS diff --git a/subsys/net/lib/mcumgr_smp_client/Kconfig b/subsys/net/lib/mcumgr_smp_client/Kconfig index 80f07babeb5a..dd3ba204cbf3 100644 --- a/subsys/net/lib/mcumgr_smp_client/Kconfig +++ b/subsys/net/lib/mcumgr_smp_client/Kconfig @@ -30,6 +30,6 @@ config NRF_MCUMGR_SMP_CLIENT_SHELL module = NRF_MCUMGR_SMP_CLIENT module-dep = LOG module-str = NRF_MCUmgr_smp_client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NRF_MCUMGR_SMP_CLIENT diff --git a/subsys/net/lib/mqtt_helper/Kconfig b/subsys/net/lib/mqtt_helper/Kconfig index b272166d77c8..2eac2fcb0b18 100644 --- a/subsys/net/lib/mqtt_helper/Kconfig +++ b/subsys/net/lib/mqtt_helper/Kconfig @@ -125,6 +125,6 @@ endif module = MQTT_HELPER module-str = MQTT helper library -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # MQTT_HELPER diff --git a/subsys/net/lib/nrf70_fw_ext/Kconfig b/subsys/net/lib/nrf70_fw_ext/Kconfig index 9ba85b6708fc..d1892ca41a60 100644 --- a/subsys/net/lib/nrf70_fw_ext/Kconfig +++ b/subsys/net/lib/nrf70_fw_ext/Kconfig @@ -90,5 +90,5 @@ endif config CUSTOM_LINKER_SCRIPT string "Custom linker script for nRF70 FW patches in external flash" - default "${ZEPHYR_BASE}/../nrf/subsys/net/lib/nrf70_fw_ext/rpu_fw_patches.ld" + default "$(ZEPHYR_BASE)/../nrf/subsys/net/lib/nrf70_fw_ext/rpu_fw_patches.ld" endif diff --git a/subsys/net/lib/rest_client/Kconfig b/subsys/net/lib/rest_client/Kconfig index 122310bc33e2..d7a1debbb203 100644 --- a/subsys/net/lib/rest_client/Kconfig +++ b/subsys/net/lib/rest_client/Kconfig @@ -28,6 +28,6 @@ module=REST_CLIENT module-dep=LOG module-str=Log level for REST Client lib module-help=Enables REST Client log messages. -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # REST_CLIENT diff --git a/subsys/net/lib/softap_wifi_provision/Kconfig b/subsys/net/lib/softap_wifi_provision/Kconfig index 79fb2d1e6ca7..470ac1acc51a 100644 --- a/subsys/net/lib/softap_wifi_provision/Kconfig +++ b/subsys/net/lib/softap_wifi_provision/Kconfig @@ -102,6 +102,6 @@ config SOFTAP_WIFI_PROVISION_MESSAGE_QUEUE_ENTRIES module = SOFTAP_WIFI_PROVISION module-str = SoftAP Wi-Fi provision -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # SOFTAP_WIFI_PROVISION diff --git a/subsys/net/lib/wifi_prov_core/Kconfig b/subsys/net/lib/wifi_prov_core/Kconfig index 4af1c0280d23..63ca7a444823 100644 --- a/subsys/net/lib/wifi_prov_core/Kconfig +++ b/subsys/net/lib/wifi_prov_core/Kconfig @@ -20,4 +20,4 @@ config WIFI_PROV_CORE module = WIFI_PROV_CORE module-dep = LOG module-str = Log level for sample -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/subsys/net/lib/zzhc/Kconfig b/subsys/net/lib/zzhc/Kconfig index f42faf0fdec0..26168db30a6b 100644 --- a/subsys/net/lib/zzhc/Kconfig +++ b/subsys/net/lib/zzhc/Kconfig @@ -30,7 +30,7 @@ config ZZHC_THREAD_PRIO module = ZZHC module-str = ZZHC Daemon -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # ZZHC diff --git a/subsys/net_core_monitor/Kconfig b/subsys/net_core_monitor/Kconfig index c80d8dc34489..4d1fe12565e6 100644 --- a/subsys/net_core_monitor/Kconfig +++ b/subsys/net_core_monitor/Kconfig @@ -34,6 +34,6 @@ endmenu module = NET_CORE_MONITOR module-str = NET_CORE_MONITOR -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif #NET_CORE_MONITOR diff --git a/subsys/nfc/lib/Kconfig b/subsys/nfc/lib/Kconfig index 27084472fbb5..6e7a45e8ce38 100644 --- a/subsys/nfc/lib/Kconfig +++ b/subsys/nfc/lib/Kconfig @@ -153,6 +153,6 @@ endif # NFC_THREAD_CALLBACK module = NFC_PLATFORM module-str = nfc_platform -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_PLATFORM diff --git a/subsys/nfc/ndef/Kconfig b/subsys/nfc/ndef/Kconfig index acab3de6272d..993210691954 100644 --- a/subsys/nfc/ndef/Kconfig +++ b/subsys/nfc/ndef/Kconfig @@ -95,7 +95,7 @@ if NFC_NDEF_PARSER module = NFC_NDEF_PARSER module-str = nfc_ndef_parser -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config NFC_NDEF_LE_OOB_REC_PARSER bool "NDEF LE OOB record parser library" @@ -111,7 +111,7 @@ if NFC_NDEF_LE_OOB_REC_PARSER module = NFC_NDEF_LE_OOB_REC_PARSER module-str = nfc_ndef_le_oob_rec_parser -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_NDEF_LE_OOB_REC_PARSER @@ -119,7 +119,7 @@ if NFC_NDEF_CH_PARSER module = NFC_NDEF_CH_REC_PARSER module-str = nfc_ndef_ch_rec_parser -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_NDEF_CH_PARSER diff --git a/subsys/nfc/t2t/Kconfig b/subsys/nfc/t2t/Kconfig index c99d8a20cf40..af01a272e2ca 100644 --- a/subsys/nfc/t2t/Kconfig +++ b/subsys/nfc/t2t/Kconfig @@ -13,6 +13,6 @@ if NFC_T2T_PARSER module = NFC_T2T_PARSER module-str = nfc_t2t_parser -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_NDEF_PARSER diff --git a/subsys/nfc/t4t/Kconfig b/subsys/nfc/t4t/Kconfig index 3de7f8287a5c..57a1fc74f047 100644 --- a/subsys/nfc/t4t/Kconfig +++ b/subsys/nfc/t4t/Kconfig @@ -60,7 +60,7 @@ config NFC_T4T_ISODEP_DESELECT_RETRY module = NFC_T4T_ISODEP module-str = ISODEP -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_T4T_ISODEP @@ -73,7 +73,7 @@ if NFC_T4T_APDU module = NFC_T4T_APDU module-str = APDU -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_T4T_APDU @@ -86,7 +86,7 @@ if NFC_T4T_CC_FILE module = NFC_T4T_CC_FILE module-str = CC_FILE -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_T4T_CC_FILE @@ -115,6 +115,6 @@ config NFC_T4T_HL_PROCEDURE_APDU_BUF_SIZE module = NFC_T4T_HL_PROCEDURE module-str = HL_PROCEDURE -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_T4T_HL_PROCEDURE diff --git a/subsys/nfc/tnep/Kconfig b/subsys/nfc/tnep/Kconfig index 7bc7b48557fe..a5c4538076c6 100644 --- a/subsys/nfc/tnep/Kconfig +++ b/subsys/nfc/tnep/Kconfig @@ -30,7 +30,7 @@ config NFC_TNEP_RX_MAX_RECORD_SIZE module = NFC_TNEP_TAG module-str = TNEP_TAG -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_TNEP_TAG @@ -54,7 +54,7 @@ config NFC_TNEP_POLLER_RX_MAX_RECORD_CNT module = NFC_TNEP_POLLER module-str = TNEP_POLLER -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_TNEP_POLLER diff --git a/subsys/nfc/tnep/ch/Kconfig b/subsys/nfc/tnep/ch/Kconfig index 2f20fe31923a..18883bf2b667 100644 --- a/subsys/nfc/tnep/ch/Kconfig +++ b/subsys/nfc/tnep/ch/Kconfig @@ -79,6 +79,6 @@ config NFC_TNEP_CH_PARSER_BUFFER_SIZE module = NFC_TNEP_CH module-str = TNEP_CH -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NFC_TNEP_CH diff --git a/subsys/nrf_rpc/Kconfig b/subsys/nrf_rpc/Kconfig index ca6f58971da5..ed6f68d5aae1 100644 --- a/subsys/nrf_rpc/Kconfig +++ b/subsys/nrf_rpc/Kconfig @@ -176,21 +176,21 @@ endif # NRF_RPC_CALLBACK_PROXY module = NRF_RPC module-str = NRF_RPC -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" module = NRF_RPC_TR module-str = NRF_RPC_TR -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" module = NRF_RPC_OS module-str = NRF_RPC_OS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if NRF_RPC_CBOR module = NRF_RPC_CBOR module-str = NRF_RPC_CBOR -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif # NRF_RPC_CBOR diff --git a/subsys/nrf_security/src/drivers/cracen/Kconfig b/subsys/nrf_security/src/drivers/cracen/Kconfig index cf69347780e8..61c8eef34934 100644 --- a/subsys/nrf_security/src/drivers/cracen/Kconfig +++ b/subsys/nrf_security/src/drivers/cracen/Kconfig @@ -25,7 +25,7 @@ config CRACEN_NEED_IKG_INTERRUPT_WORKAROUND # Configure CRACEN_LOG_LEVEL module = CRACEN module-str = CRACEN -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" if PSA_CRYPTO_DRIVER_CRACEN diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig index bef4c22ecd62..67ff30acf258 100644 --- a/subsys/sdfw_services/Kconfig +++ b/subsys/sdfw_services/Kconfig @@ -69,6 +69,6 @@ rsource "transport/Kconfig" module = SSF_CLIENT module-str = SSF Client -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endmenu # "SDFW Service Framework" diff --git a/subsys/sdfw_services/services/Kconfig.template.service b/subsys/sdfw_services/services/Kconfig.template.service index 2dbe37cd238b..90c23ba03999 100644 --- a/subsys/sdfw_services/services/Kconfig.template.service +++ b/subsys/sdfw_services/services/Kconfig.template.service @@ -44,6 +44,6 @@ config SSF_$(service_name)_SERVICE_BUFFER_SIZE module = SSF_$(service_name)_SERVICE module-str = $(service_name_str) service -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/subsys/sdfw_services/services/extmem/Kconfig b/subsys/sdfw_services/services/extmem/Kconfig index 3e60eb3c32eb..f7fdd8d67054 100644 --- a/subsys/sdfw_services/services/extmem/Kconfig +++ b/subsys/sdfw_services/services/extmem/Kconfig @@ -51,6 +51,6 @@ config SSF_EXTMEM_WRITE_ERASE_OPS module = SSF_EXTMEM_SERVICE module-str = EXTMEM Update service -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig index 7f17e3b38997..61457fefeb74 100644 --- a/subsys/shell/Kconfig +++ b/subsys/shell/Kconfig @@ -18,13 +18,13 @@ if SHELL_BT_NUS module = SHELL_BT_NUS module-str = Shell over Bluetooth NUS -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" default-timeout = 100 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_timeout" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_timeout" default-size = 512 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_size" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_size" choice prompt "Initial log level limit" @@ -144,13 +144,13 @@ config SHELL_IPC_INIT_LOG_LEVEL module = SHELL_IPC module-str = Shell over the IPC Service -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" default-timeout = 100 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_timeout" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_timeout" default-size = 512 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_size" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_size" endif #SHELL_IPC @@ -231,13 +231,13 @@ config SHELL_NFC_INIT_LOG_LEVEL module = SHELL_NFC module-str = Shell over the NFC T4T ISO-DEP -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" default-timeout = 100 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_timeout" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_timeout" default-size = 512 -source "${ZEPHYR_BASE}/subsys/shell/Kconfig.template.shell_log_queue_size" +source "$(ZEPHYR_BASE)/subsys/shell/Kconfig.template.shell_log_queue_size" endif # SHELL_NFC diff --git a/subsys/uart_async_adapter/Kconfig b/subsys/uart_async_adapter/Kconfig index 5148fb511933..3c4e47ad6018 100644 --- a/subsys/uart_async_adapter/Kconfig +++ b/subsys/uart_async_adapter/Kconfig @@ -17,6 +17,6 @@ if UART_ASYNC_ADAPTER module = UART_ASYNC_ADAPTER module-str = UART Async Adapter -source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" +source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" endif diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index 742adcc1123e..9290271c5f90 100644 --- a/sysbuild/Kconfig.appcore +++ b/sysbuild/Kconfig.appcore @@ -67,9 +67,9 @@ config APPCORE_IMAGE_NAME config APPCORE_IMAGE_PATH string - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_app_core" if APPCORE_EMPTY && SOC_SERIES_NRF53X - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/remote_shell" if APPCORE_REMOTE_SHELL && SOC_SERIES_NRF53X - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf54h20/empty_app_core" if APPCORE_EMPTY && SOC_NRF54H20 + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/nrf5340/empty_app_core" if APPCORE_EMPTY && SOC_SERIES_NRF53X + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/nrf5340/remote_shell" if APPCORE_REMOTE_SHELL && SOC_SERIES_NRF53X + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/nrf54h20/empty_app_core" if APPCORE_EMPTY && SOC_NRF54H20 help Source directory of appcore image. diff --git a/sysbuild/Kconfig.firmware_loader b/sysbuild/Kconfig.firmware_loader index 29710665968e..637ae9ab419f 100644 --- a/sysbuild/Kconfig.firmware_loader +++ b/sysbuild/Kconfig.firmware_loader @@ -23,4 +23,4 @@ config FIRMWARE_LOADER_IMAGE_NAME default "smp_svr_mini_boot" if FIRMWARE_LOADER_IMAGE_SMP_SVR_MINI_BOOT config FIRMWARE_LOADER_IMAGE_PATH - default "${ZEPHYR_NRF_MODULE_DIR}/samples/zephyr/smp_svr_mini_boot" if FIRMWARE_LOADER_IMAGE_SMP_SVR_MINI_BOOT + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/zephyr/smp_svr_mini_boot" if FIRMWARE_LOADER_IMAGE_SMP_SVR_MINI_BOOT diff --git a/sysbuild/Kconfig.hpf b/sysbuild/Kconfig.hpf index 7a8ac4867120..46b1df0ff042 100644 --- a/sysbuild/Kconfig.hpf +++ b/sysbuild/Kconfig.hpf @@ -25,8 +25,8 @@ config HPF_DEVELOPER_MODE config HPF_IMAGE_PATH string - default "${ZEPHYR_NRF_MODULE_DIR}/applications/hpf/gpio" if HPF_GPIO - default "${ZEPHYR_NRF_MODULE_DIR}/applications/hpf/mspi" if HPF_MSPI + default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/gpio" if HPF_GPIO + default "$(ZEPHYR_NRF_MODULE_DIR)/applications/hpf/mspi" if HPF_MSPI help Source directory of HPF image. diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index baf59c038af6..bae87cb06a0e 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -142,11 +142,11 @@ config NETCORE_IMAGE_NAME config NETCORE_IMAGE_PATH string - default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_net_core" if NETCORE_EMPTY - default "${ZEPHYR_BASE}/samples/bluetooth/hci_ipc" if NETCORE_HCI_IPC - default "${ZEPHYR_NRF_MODULE_DIR}/samples/bluetooth/rpc_host" if NETCORE_RPC_HOST - default "${ZEPHYR_BASE}/samples/boards/nordic/ieee802154/802154_rpmsg" if NETCORE_802154_RPMSG - default "${ZEPHYR_NRF_MODULE_DIR}/applications/ipc_radio" if NETCORE_IPC_RADIO + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/nrf5340/empty_net_core" if NETCORE_EMPTY + default "$(ZEPHYR_BASE)/samples/bluetooth/hci_ipc" if NETCORE_HCI_IPC + default "$(ZEPHYR_NRF_MODULE_DIR)/samples/bluetooth/rpc_host" if NETCORE_RPC_HOST + default "$(ZEPHYR_BASE)/samples/boards/nordic/ieee802154/802154_rpmsg" if NETCORE_802154_RPMSG + default "$(ZEPHYR_NRF_MODULE_DIR)/applications/ipc_radio" if NETCORE_IPC_RADIO help Source directory of netcore image. diff --git a/tests/benchmarks/multicore/idle_usb/Kconfig b/tests/benchmarks/multicore/idle_usb/Kconfig index a0163026acc9..b1217b60ee42 100644 --- a/tests/benchmarks/multicore/idle_usb/Kconfig +++ b/tests/benchmarks/multicore/idle_usb/Kconfig @@ -1,3 +1,3 @@ -source "${ZEPHYR_BASE}/samples/subsys/usb/common/Kconfig.sample_usbd" +source "$(ZEPHYR_BASE)/samples/subsys/usb/common/Kconfig.sample_usbd" source "Kconfig.zephyr" diff --git a/tests/benchmarks/peripheral_load/Kconfig b/tests/benchmarks/peripheral_load/Kconfig index a0163026acc9..b1217b60ee42 100644 --- a/tests/benchmarks/peripheral_load/Kconfig +++ b/tests/benchmarks/peripheral_load/Kconfig @@ -1,3 +1,3 @@ -source "${ZEPHYR_BASE}/samples/subsys/usb/common/Kconfig.sample_usbd" +source "$(ZEPHYR_BASE)/samples/subsys/usb/common/Kconfig.sample_usbd" source "Kconfig.zephyr" diff --git a/tests/bluetooth/bsim/nrf_auraconfig/Kconfig b/tests/bluetooth/bsim/nrf_auraconfig/Kconfig index e94939c33fc1..99b8eaf4056d 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/Kconfig +++ b/tests/bluetooth/bsim/nrf_auraconfig/Kconfig @@ -4,10 +4,10 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/audio/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/bluetooth/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/modules/Kconfig" -rsource "${ZEPHYR_NRF_MODULE_DIR}/applications/nrf5340_audio/src/utils/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/audio/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/bluetooth/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/modules/Kconfig" +rsource "$(ZEPHYR_NRF_MODULE_DIR)/applications/nrf5340_audio/src/utils/Kconfig" #----------------------------------------------------------------------------# diff --git a/tests/subsys/bootloader/boot_chains/Kconfig.sysbuild b/tests/subsys/bootloader/boot_chains/Kconfig.sysbuild index 6d24f355f7ac..5cb2af0f53ef 100644 --- a/tests/subsys/bootloader/boot_chains/Kconfig.sysbuild +++ b/tests/subsys/bootloader/boot_chains/Kconfig.sysbuild @@ -14,4 +14,4 @@ config SECURE_BOOT_GENERATE_DEFAULT_KMU_KEYFILE endif -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" +source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig" diff --git a/west.yml b/west.yml index 1cca0cc4fb8e..3f8012b969f2 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 9f038bf1860117b8e039a2347a1abaebb38807c5 + revision: 25ced410af6caf6fea810b49ef4cf9b3bcb40b2b import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above