kconfig: Change CMake-style variable usage to Kconfig-style

.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
 

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"

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"

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"

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"

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"

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
 

doc/_extensions/options_from_kconfig.py

@@ -1,3 +1,3 @@
 # Copyright (c) 2020 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -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 @@
             )
         )
         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)
 

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}/<image_path>" if NETCORE_ABC
+            default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/<image_path>" 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}/<image_path>" if FIRMWARE_LOADER_IMAGE_ABC
+            default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/<image_path>" 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}/<image_path>" if NETCORE_ABC
+        default "$(ZEPHYR_MY_MODULE_MODULE_DIR)/<image_path>" if NETCORE_ABC
 
     endif # !NETCORE_NONE
 

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

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:
 

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:
 

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

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

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"

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

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

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

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

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

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

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

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

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

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

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"

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

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

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

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