diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 2c8a16cb51e4..55f18efb7855 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -67,10 +67,9 @@ jobs: # debug ls -la git log --pretty=oneline | head -n 10 - # For now we run KconfigBasic, but we should transition to Kconfig - $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \ + $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate \ -e KconfigBasicNoModules -e ClangFormat -e Ruff \ - -e SysbuildKconfig -e SysbuildKconfigBasic -e SysbuildKconfigBasicNoModules \ + -e SysbuildKconfigBasicNoModules \ -c origin/${BASE_REF}.. - name: upload-results diff --git a/.gitignore b/.gitignore index 41b7c7f82d17..302515d4acde 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,33 @@ ext/BSEC_* applications/nrf5340_audio/src/fw_info_app.c scripts/hid_configurator/hidapi.dll + +# CI output +compliance.xml + +# from check_compliance.py +BinaryFiles.txt +BoardYml.txt +Checkpatch.txt +ClangFormat.txt +DevicetreeBindings.txt +GitDiffCheck.txt +Gitlint.txt +Identity.txt +ImageSize.txt +Kconfig.txt +KconfigBasic.txt +KconfigBasicNoModules.txt +KconfigHWMv2.txt +KeepSorted.txt +MaintainersFormat.txt +ModulesMaintainers.txt +Nits.txt +Pylint.txt +Ruff.txt +SphinxLint.txt +SysbuildKconfig.txt +SysbuildKconfigBasic.txt +SysbuildKconfigBasicNoModules.txt +TextEncoding.txt +YAMLLint.txt diff --git a/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig index a995d627eaa3..31f59f739745 100644 --- a/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig +++ b/boards/nordic/nrf52820dongle/nrf52820dongle_nrf52820_defconfig @@ -1,5 +1,5 @@ # Enable MPU CONFIG_ARM_MPU=y -# enable GPIO +# Enable GPIO CONFIG_GPIO=y diff --git a/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig index a995d627eaa3..31f59f739745 100644 --- a/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig +++ b/boards/nordic/nrf52833dongle/nrf52833dongle_nrf52833_defconfig @@ -1,5 +1,5 @@ # Enable MPU CONFIG_ARM_MPU=y -# enable GPIO +# Enable GPIO CONFIG_GPIO=y diff --git a/boards/nordic/thingy91/thingy91_nrf52840_defconfig b/boards/nordic/thingy91/thingy91_nrf52840_defconfig index b01b2739f724..0df16638b1d7 100644 --- a/boards/nordic/thingy91/thingy91_nrf52840_defconfig +++ b/boards/nordic/thingy91/thingy91_nrf52840_defconfig @@ -1,7 +1,7 @@ # Enable MPU CONFIG_ARM_MPU=y -# enable UART driver +# Enable UART driver CONFIG_SERIAL=y # Enable console diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig index e58bcdbdee60..53416209e125 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig @@ -10,13 +10,13 @@ CONFIG_HW_STACK_PROTECTION=y # Enable TrustZone-M CONFIG_ARM_TRUSTZONE_M=y -# enable GPIO +# Enable GPIO CONFIG_GPIO=y # Enable UART driver CONFIG_SERIAL=y -# enable console +# Enable console CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig index d97fc72f91b9..a7d2072005a2 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_ns_defconfig @@ -13,13 +13,13 @@ CONFIG_ARM_TRUSTZONE_M=y # This Board implies building Non-Secure firmware CONFIG_TRUSTED_EXECUTION_NONSECURE=y -# enable GPIO +# Enable GPIO CONFIG_GPIO=y # Enable UART driver CONFIG_SERIAL=y -# enable console +# Enable console CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig index 04b0b9ef9ac9..c77f7df7acf2 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig @@ -7,12 +7,12 @@ CONFIG_ARM_MPU=y # Enable hardware stack protection CONFIG_HW_STACK_PROTECTION=y -# enable GPIO +# Enable GPIO CONFIG_GPIO=y # Enable UART driver CONFIG_SERIAL=y -# enable console +# Enable console CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/doc/kconfig/conf.py b/doc/kconfig/conf.py index acd0431c362f..8737334ec990 100644 --- a/doc/kconfig/conf.py +++ b/doc/kconfig/conf.py @@ -66,7 +66,15 @@ / "memfault-firmware-sdk" / "Kconfig" ) - +os.environ["ZEPHYR_NRF_KCONFIG"] = str( + NRF_BASE + / "Kconfig.nrf" +) +os.environ["SYSBUILD_NRF_KCONFIG"] = str( + NRF_BASE + / "sysbuild" + / "Kconfig.sysbuild" +) def setup(app): app.add_css_file("css/kconfig.css") 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 07438120c281..e50c0123f45a 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 @@ -162,7 +162,7 @@ This can be handled using the following approach: # This will set a bool Kconfig option in the image (note: sysbuild forces this setting, it cannot be overwritten by changing the application configuration) set_config_bool(${SB_CONFIG_NETCORE_IMAGE_NAME} CONFIG_MY_CUSTOM_CONFIG y) # This will set a string (or numeric) Kconfig option in the image (note: sysbuild forces this setting, it cannot be overwritten by changing the application configuration) - set_property(TARGET ${SB_CONFIG_NETCORE_IMAGE_NAME} APPEND_STRING PROPERTY CONFIG "CONFIG_CUSTOM_STRING=my_custom_value\n") + set_property(TARGET ${SB_CONFIG_NETCORE_IMAGE_NAME} APPEND_STRING PROPERTY CONFIG "CONFIG_FOO=my_custom_value\n") endif() .. _sysbuild_images_adding_custom_firmware_loader_images: @@ -223,7 +223,7 @@ This can be handled using the following approach: # This will set a bool Kconfig option in the image (note: sysbuild forces this setting, it cannot be overwritten by changing the application configuration) set_config_bool(${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME} CONFIG_MY_CUSTOM_CONFIG y) # This will set a string (or numeric) Kconfig option in the image (note: sysbuild forces this setting, it cannot be overwritten by changing the application configuration) - set_property(TARGET ${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME} APPEND_STRING PROPERTY CONFIG "CONFIG_CUSTOM_STRING=my_custom_value\n") + set_property(TARGET ${SB_CONFIG_FIRMWARE_LOADER_IMAGE_NAME} APPEND_STRING PROPERTY CONFIG "CONFIG_FOO=my_custom_value\n") endif() .. _sysbuild_images_adding_to_a_single_board: diff --git a/doc/nrf/security/crypto/crypto_supported_features.rst b/doc/nrf/security/crypto/crypto_supported_features.rst index d6fa2e80aa16..397ba07b5e2d 100644 --- a/doc/nrf/security/crypto/crypto_supported_features.rst +++ b/doc/nrf/security/crypto/crypto_supported_features.rst @@ -45,7 +45,7 @@ The listed ``CONFIG_`` Kconfig options enable the features and algorithms for th The Kconfig options follow the ``CONFIG_PSA_WANT_*`` + ``CONFIG_PSA_USE_*`` configuration scheme, which is described in detail on the :ref:`crypto_drivers` page. .. note:: - On nRF54H Series devices, the ``CONFIG_PSA_WANT`` and ``CONFIG_PSA_USE`` feature selection scheme is not implemented and enabling any feature with these options will silently have no effect. + On nRF54H Series devices, the ``CONFIG_PSA_WANT_*`` and ``CONFIG_PSA_USE_*`` feature selection scheme is not implemented and enabling any feature with these options will silently have no effect. The |ISE| implements a fixed set of features and algorithms that cannot be changed by the user. @@ -2297,7 +2297,7 @@ The following tables show the ``CONFIG_PSA_USE_*`` Kconfig options for configuri | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_NO_PADDING` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_PKCS7` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CTR` - | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_NO_TAG` + | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_STAR_NO_TAG` | :kconfig:option:`CONFIG_PSA_WANT_ALG_STREAM_CIPHER` .. tab:: nRF53 Series @@ -2334,7 +2334,7 @@ The following tables show the ``CONFIG_PSA_USE_*`` Kconfig options for configuri | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_NO_PADDING` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_PKCS7` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CTR` - | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_NO_TAG` + | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_STAR_NO_TAG` | :kconfig:option:`CONFIG_PSA_WANT_ALG_STREAM_CIPHER` .. tab:: nRF54L Series @@ -2371,7 +2371,7 @@ The following tables show the ``CONFIG_PSA_USE_*`` Kconfig options for configuri | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_NO_PADDING` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_PKCS7` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CTR` - | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_NO_TAG` + | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_STAR_NO_TAG` | :kconfig:option:`CONFIG_PSA_WANT_ALG_STREAM_CIPHER` .. tab:: nRF91 Series @@ -2408,7 +2408,7 @@ The following tables show the ``CONFIG_PSA_USE_*`` Kconfig options for configuri | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_NO_PADDING` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CBC_PKCS7` | :kconfig:option:`CONFIG_PSA_WANT_ALG_CTR` - | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_NO_TAG` + | :kconfig:option:`CONFIG_PSA_WANT_ALG_CCM_STAR_NO_TAG` | :kconfig:option:`CONFIG_PSA_WANT_ALG_STREAM_CIPHER` diff --git a/doc/nrf/templates/application_README.rst b/doc/nrf/templates/application_README.rst index e2ba5f90018a..537ec9239840 100644 --- a/doc/nrf/templates/application_README.rst +++ b/doc/nrf/templates/application_README.rst @@ -128,7 +128,7 @@ Additional configuration* .. note:: * Add this section to describe and link to any library configuration options that might be important to run this application. - You can link to options with ``:kconfig:option:`CONFIG_XXX```. + You can link to options with ``:kconfig:option:`CONFIG_FOO```. * You need not list all possible configuration options, but only the ones that are relevant. Check and configure the following library options that are used by the application: diff --git a/doc/nrf/templates/sample_README.rst b/doc/nrf/templates/sample_README.rst index b69bca49b1c5..4b9203128a28 100644 --- a/doc/nrf/templates/sample_README.rst +++ b/doc/nrf/templates/sample_README.rst @@ -151,7 +151,7 @@ Additional configuration* .. note:: * Add this section to describe and link to any library configuration options that might be important to run this sample. - You can link to options with ``:kconfig:option:`CONFIG_XXX```. + You can link to options with ``:kconfig:option:`CONFIG_FOO```. * You do not need to list all possible configuration options, but only the ones that are relevant. Check and configure the following library options that are used by the sample: diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index e322143d6a5b..39e12d9e82de 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -51,7 +51,7 @@ config FLASH_RPC_SYS_INIT_PRIORITY Device driver initialization priority. config FLASH_RPC_SYS_INIT - bool "Enable at sys init" + bool "sys init" help SYS_INIT nrf_rpc diff --git a/drivers/mpsl/flash_sync/Kconfig b/drivers/mpsl/flash_sync/Kconfig index 08a3055b5bfb..5ca0868c67ae 100644 --- a/drivers/mpsl/flash_sync/Kconfig +++ b/drivers/mpsl/flash_sync/Kconfig @@ -7,7 +7,7 @@ if SOC_FLASH_NRF || SOC_FLASH_NRF_RRAM || SOC_NRF54H20 config SOC_FLASH_NRF_RADIO_SYNC_RPC - bool "Enable flash driver synchronization with radio protocols through RPC" + bool "Flash driver synchronization with radio protocols through RPC" help Enable the flash synchronization between the application core and the radio core. This Kconfig option is set based on the value of the SB_CONFIG_SOC_FLASH_NRF_RADIO_SYNC_RPC diff --git a/drivers/serial/Kconfig.nrf_sw_lpuart b/drivers/serial/Kconfig.nrf_sw_lpuart index 4a67af318fee..12cf65c57732 100644 --- a/drivers/serial/Kconfig.nrf_sw_lpuart +++ b/drivers/serial/Kconfig.nrf_sw_lpuart @@ -52,7 +52,7 @@ config NRF_SW_LPUART_DEFAULT_TX_TIMEOUT driven API is enabled). config NRF_SW_LPUART_INT_DRIVEN - bool "Enable interrupt driven API" + bool "Interrupt driven API" select UART_INTERRUPT_DRIVEN help If enabled, then asynchronous API cannot be used diff --git a/include/util/util_macro.h b/include/util/util_macro.h index 183b275b3720..6636a1c75d4a 100644 --- a/include/util/util_macro.h +++ b/include/util/util_macro.h @@ -80,9 +80,9 @@ extern "C" { * * Example: * - * IF_ENABLED_ALL((CONFIG_FLAG_A, CONFIG_FLAG_B), uint32_t foo;) + * IF_ENABLED_ALL((CONFIG_FOO, CONFIG_BAR), uint32_t foo;) * - * If @p CONFIG_FLAG_A and @p CONFIG_FLAG_B are defined to 1, this expands to: + * If @p CONFIG_FOO and @p CONFIG_BAR are defined to 1, this expands to: * * uint32_t foo; * @@ -102,9 +102,9 @@ extern "C" { * * Example: * - * IF_ENABLED_ANY((CONFIG_FLAG_A, CONFIG_FLAG_B), uint32_t foo;) + * IF_ENABLED_ANY((CONFIG_FOO, CONFIG_BAR), uint32_t foo;) * - * If @p CONFIG_FLAG_A or @p CONFIG_FLAG_B defined to 1, this expands to: + * If @p CONFIG_FOO or @p CONFIG_BAR defined to 1, this expands to: * * uint32_t foo; * diff --git a/lib/bin/lwm2m_carrier/Kconfig b/lib/bin/lwm2m_carrier/Kconfig index faf7ea55ba80..a7cd24df1c60 100644 --- a/lib/bin/lwm2m_carrier/Kconfig +++ b/lib/bin/lwm2m_carrier/Kconfig @@ -42,7 +42,7 @@ menuconfig LWM2M_CARRIER if LWM2M_CARRIER -menu "Enabled Carriers" +menu "Carriers" config LWM2M_CARRIER_GENERIC bool "Generic" @@ -235,7 +235,7 @@ config LWM2M_CARRIER_PDN_TYPE PDN type for custom APN. config LWM2M_CARRIER_QUEUE_MODE - bool "Enable queue mode" + bool "Queue mode" default y help Configure whether the LwM2M device is to inform the LwM2M server that diff --git a/lib/dk_buttons_and_leds/Kconfig b/lib/dk_buttons_and_leds/Kconfig index 437289706432..1e96cdcaa937 100644 --- a/lib/dk_buttons_and_leds/Kconfig +++ b/lib/dk_buttons_and_leds/Kconfig @@ -15,7 +15,7 @@ config DK_LIBRARY_BUTTON_SCAN_INTERVAL default 10 config DK_LIBRARY_DYNAMIC_BUTTON_HANDLERS - bool "Enable the runtime assignable button handler API" + bool "Runtime assignable button handler API" default y module = DK_LIBRARY diff --git a/lib/edge_impulse/Kconfig b/lib/edge_impulse/Kconfig index 13d4936b6b60..061d8376c4de 100644 --- a/lib/edge_impulse/Kconfig +++ b/lib/edge_impulse/Kconfig @@ -5,7 +5,7 @@ # menuconfig EDGE_IMPULSE - bool "Enable Edge Impulse" + bool "Edge Impulse" depends on CPP depends on STD_CPP11 depends on !FP16 @@ -51,7 +51,7 @@ config EDGE_IMPULSE_URI endif # EDGE_IMPULSE menuconfig EI_WRAPPER - bool "Enable Edge Impulse wrapper" + bool "Edge Impulse wrapper" depends on EDGE_IMPULSE default y help diff --git a/lib/fprotect/Kconfig b/lib/fprotect/Kconfig index 69eb4859f83e..d42adb7aed71 100644 --- a/lib/fprotect/Kconfig +++ b/lib/fprotect/Kconfig @@ -47,7 +47,7 @@ config FPROTECT_BLOCK_SIZE default $(dt_node_int_prop_hex,$(DT_CHOSEN_ZEPHYR_FLASH),erase-block-size) menuconfig FPROTECT - bool "Enable FPROTECT" + bool "FPROTECT" depends on SOC_FAMILY_NORDIC_NRF depends on !(SOC_SERIES_NRF54LX && IS_SECURE_BOOTLOADER) depends on !SOC_SERIES_NRF54HX diff --git a/lib/hw_unique_key/Kconfig b/lib/hw_unique_key/Kconfig index fb790b27710f..e50a91985e52 100644 --- a/lib/hw_unique_key/Kconfig +++ b/lib/hw_unique_key/Kconfig @@ -65,7 +65,7 @@ config HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT still requires the device to reboot and the bootloader to load the HUK config HW_UNIQUE_KEY_RANDOM - bool "Enable writing random HW Unique Keys" + bool "Support writing random HW Unique Keys" depends on MAIN_STACK_SIZE >= 2048 || BUILD_WITH_TFM default y if BUILD_WITH_TFM help diff --git a/lib/identity_key/Kconfig b/lib/identity_key/Kconfig index f007cae98a58..85a7adc55bdf 100644 --- a/lib/identity_key/Kconfig +++ b/lib/identity_key/Kconfig @@ -19,7 +19,7 @@ menuconfig IDENTITY_KEY if IDENTITY_KEY config IDENTITY_KEY_RANDOM - bool "Enable writing random Identity Keys" + bool "Support writing random Identity Keys" select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT select PSA_WANT_ECC_SECP_R1_256 diff --git a/lib/lte_link_control/Kconfig b/lib/lte_link_control/Kconfig index 473dc96a2468..95e83654e35f 100644 --- a/lib/lte_link_control/Kconfig +++ b/lib/lte_link_control/Kconfig @@ -70,12 +70,12 @@ endif # LTE_LC_DNS_FALLBACK_MODULE # End of modules Kconfig options config LTE_SHELL - bool "Enable LTE shell commands" + bool "LTE shell commands" default y depends on SHELL config LTE_LOCK_BANDS - bool "Enable LTE band lock" + bool "LTE band lock" help Enable LTE band lock. Bands not enabled in LTE_LOCK_BAND_MASK are not used when this setting is enabled. @@ -98,7 +98,7 @@ config LTE_PLMN_SELECTION_OPTIMIZATION Refer to the AT%FEACONF command in the AT command manual for more details. config LTE_LOCK_PLMN - bool "Enable LTE PLMN lock" + bool "LTE PLMN lock" help Enable PLMN lock for network selection. @@ -120,7 +120,7 @@ config LTE_UNLOCK_PLMN if LTE_LC_PSM_MODULE config LTE_PSM_REQ - bool "Enable PSM request" + bool "PSM request" help Enable request for use of PSM using AT+CPSMS. If this option is set the library will automatically request PSM when @@ -178,7 +178,7 @@ config LTE_PSM_REQ_RAT_SECONDS non-negative value can be given. config LTE_PROPRIETARY_PSM_REQ - bool "Enable use of proprietary PSM" + bool "Proprietary PSM" help Enable use of proprietary PSM using AT%FEACONF. To use this feature, also PSM request must be enabled using CONFIG_LTE_PSM_REQ or lte_lc_psm_req(). @@ -189,7 +189,7 @@ endif # LTE_LC_PSM_MODULE if LTE_LC_EDRX_MODULE config LTE_EDRX_REQ - bool "Enable eDRX request" + bool "eDRX request" help Enable request for use of eDRX using AT+CEDRXS. For reference, see 3GPP 27.007 Ch. 7.40. diff --git a/lib/modem_attest_token/Kconfig b/lib/modem_attest_token/Kconfig index 7b8df734fcdf..2dbad196c06a 100644 --- a/lib/modem_attest_token/Kconfig +++ b/lib/modem_attest_token/Kconfig @@ -15,7 +15,7 @@ menuconfig MODEM_ATTEST_TOKEN if MODEM_ATTEST_TOKEN config MODEM_ATTEST_TOKEN_PARSING - bool "Enable parsing of the attestation token" + bool "Parsing of the attestation token" select ZCBOR select BASE64 default y diff --git a/lib/ram_pwrdn/Kconfig b/lib/ram_pwrdn/Kconfig index 4299e4d8296a..7d0887c73545 100644 --- a/lib/ram_pwrdn/Kconfig +++ b/lib/ram_pwrdn/Kconfig @@ -5,7 +5,7 @@ # menuconfig RAM_POWER_DOWN_LIBRARY - bool "Enable API for turning off unused RAM segments" + bool "API for turning off unused RAM segments" depends on SOC_NRF52840 || SOC_NRF52833 || SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54LX # Powering down RAM blocks can only be done from the secure domain # for security reasons. If necessary, this limitation could be @@ -33,7 +33,7 @@ config RAM_POWER_ADJUST_ON_HEAP_RESIZE configuration will be adjusted when the libc heap (which uses the memory area following the application image) is increased or trimmed. -module = RAM_POWERDOWN +module = RAM_POWERDOWN module-str = RAM power-down library source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" diff --git a/lib/wave_gen/Kconfig b/lib/wave_gen/Kconfig index f9c21c9cf829..8e43e433b248 100644 --- a/lib/wave_gen/Kconfig +++ b/lib/wave_gen/Kconfig @@ -5,7 +5,7 @@ # menuconfig WAVE_GEN_LIB - bool "Enable wave signal generating library" + bool "Wave signal generating library" select REQUIRES_FULL_LIBC help The library can be used to generate a value of a wave signal for given time. diff --git a/modules/modules.cmake b/modules/modules.cmake index 9e6d5dd8ed14..2242ac7900d7 100644 --- a/modules/modules.cmake +++ b/modules/modules.cmake @@ -10,6 +10,8 @@ set(ZEPHYR_AZURE_SDK_FOR_C_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}/azure-sdk-for-c) set(ZEPHYR_OPENTHREAD_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}/openthread) set(ZEPHYR_OPENTHREAD_KCONFIG ${CMAKE_CURRENT_LIST_DIR}/openthread/Kconfig) set(ZEPHYR_HAL_NORDIC_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}/hal_nordic) +set(ZEPHYR_NRF_KCONFIG ${CMAKE_CURRENT_LIST_DIR}/../Kconfig.nrf) +set(SYSBUILD_NRF_KCONFIG ${CMAKE_CURRENT_LIST_DIR}/../sysbuild/Kconfig.sysbuild) # Those are modules with Kconfig tree's inside the module repo but where # nRF Connect SDK extend those trees. diff --git a/samples/Kconfig b/samples/Kconfig index 0b82520ba5bf..6d6e15112831 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -5,7 +5,7 @@ # config NCS_SAMPLES_DEFAULTS - bool "Enable NCS sample default settings" + bool "NCS sample default settings" imply LOG imply LOG_DEFAULT_MINIMAL imply ASSERT diff --git a/samples/nrf5340/extxip_smp_svr/README.rst b/samples/nrf5340/extxip_smp_svr/README.rst index 461a3a2b2831..2dba69bdf90a 100644 --- a/samples/nrf5340/extxip_smp_svr/README.rst +++ b/samples/nrf5340/extxip_smp_svr/README.rst @@ -29,7 +29,7 @@ For more information about MCUmgr and SMP, see :ref:`device_mgmt`. The sample enables the splitting by: -* Enabling the split XIP image feature through the :kconfig:option:`SB_CONFIG_XIP_SPLIT_IMAGE` sysbuild Kconfig option. +* Enabling the split XIP image feature through the :kconfig:option:`SB_CONFIG_QSPI_XIP_SPLIT_IMAGE` sysbuild Kconfig option. This Kconfig option sets a build-system level support for image division and adapts the image-signing support for MCUboot. * Using the project's CMake file which describes relocation of certain libraries or objects to an external XIP area. * Using a linker script that describes the external QSPI area. diff --git a/scripts/partition_manager/partition_manager.rst b/scripts/partition_manager/partition_manager.rst index 93a2e18e260b..86f1e18da386 100644 --- a/scripts/partition_manager/partition_manager.rst +++ b/scripts/partition_manager/partition_manager.rst @@ -548,7 +548,7 @@ After the ``nordic,pm-ext-flash`` value is set, you can place partitions in the # Name of partition external_plz: region: external_flash - size: CONFIG_EXTERNAL_PLZ_SIZE + size: CONFIG_SOME_INT .. note:: diff --git a/scripts/tests/partition_manager_test.py b/scripts/tests/partition_manager_test.py index 19bfb2a44b2c..a703e7199f8e 100644 --- a/scripts/tests/partition_manager_test.py +++ b/scripts/tests/partition_manager_test.py @@ -430,8 +430,8 @@ def test_that_offset_and_end_of_first_partition_are_correct_when_aligning_partit assert offset == 600 for l in [ - lambda: get_required_offset(align={'end': ['CONFIG_VAR']}, start=0, size=1000, move_up=False), - lambda: get_required_offset(align={'start': ['CONFIG_VAR']}, start=0, size=1000, move_up=False), + lambda: get_required_offset(align={'end': ['CONFIG_FOO']}, start=0, size=1000, move_up=False), + lambda: get_required_offset(align={'start': ['CONFIG_FOO']}, start=0, size=1000, move_up=False), lambda: get_required_offset(align={'start': [[2]]}, start=0, size=1000, move_up=False) ]: with pytest.raises(TypeError): diff --git a/subsys/app_event_manager/Kconfig b/subsys/app_event_manager/Kconfig index 40193bfd46ce..c89104e6826b 100644 --- a/subsys/app_event_manager/Kconfig +++ b/subsys/app_event_manager/Kconfig @@ -36,12 +36,12 @@ config APP_EVENT_MANAGER_SHOW_EVENT_HANDLERS This option controls if event handlers are printed to console. config APP_EVENT_MANAGER_TRACE_EVENT_DATA - bool "Enables tracing information" + bool "Tracing information" help This option allows to gather information about events for tracing purposes. config APP_EVENT_MANAGER_SHELL - bool "Enable shell integration" + bool "Shell integration" depends on SHELL default y help @@ -84,28 +84,28 @@ config APP_EVENT_MANAGER_PROVIDE_EVENT_SIZE and should be enabled only if such an information is required. config APP_EVENT_MANAGER_POSTINIT_HOOK - bool "Enable postinit hook" + bool "Post init hook" help Enable postinit hooks support. This option is here for optimisation purposes. When postinit hook is not in use the related code may be removed. config APP_EVENT_MANAGER_SUBMIT_HOOKS - bool "Enable event submit hooks" + bool "Event submit hooks" help Enable event submit hooks support. This option is here for optimisation purposes. When submit hook is not in use the related code may be removed. config APP_EVENT_MANAGER_PREPROCESS_HOOKS - bool "Enable event preprocess hooks" + bool "Event preprocess hooks" help Enable event preprocess hooks support. This option is here for optimisation purposes. When preprocess hook is not in use the related code may be removed. config APP_EVENT_MANAGER_POSTPROCESS_HOOKS - bool "Enable event postprocess hooks" + bool "Event postprocess hooks" help Enable event postprocess hooks support. This option is here for optimisation purposes. diff --git a/subsys/audio_module/Kconfig b/subsys/audio_module/Kconfig index 440719013298..db709a5dfdaf 100644 --- a/subsys/audio_module/Kconfig +++ b/subsys/audio_module/Kconfig @@ -6,11 +6,11 @@ menu "Audio Modules" config AUDIO_MODULE - tristate "Enable the audio module" + tristate "Audio module" depends on DATA_FIFO || AUDIO_MODULE_TEST config AUDIO_MODULE_TEST - bool "Enable test mode" + bool "Test mode" help Enable the test mode for the audio module. diff --git a/subsys/bluetooth/Kconfig.discovery b/subsys/bluetooth/Kconfig.discovery index 8a70621f0a4f..9020412eae7e 100644 --- a/subsys/bluetooth/Kconfig.discovery +++ b/subsys/bluetooth/Kconfig.discovery @@ -60,7 +60,7 @@ config BT_GATT_DM_MAX_ATTRS Maximum number of attributes that can be present in the discovered service. config BT_GATT_DM_DATA_PRINT - bool "Enable functions for printing discovery related data" + bool "Functions for printing discovery related data" help Enable functions for printing discovery related data diff --git a/subsys/bluetooth/Kconfig.pool b/subsys/bluetooth/Kconfig.pool index 2a5e615ff30e..d9fff3094b32 100644 --- a/subsys/bluetooth/Kconfig.pool +++ b/subsys/bluetooth/Kconfig.pool @@ -41,8 +41,7 @@ config BT_GATT_CHRC_POOL_SIZE config BT_GATT_POOL_STATS bool - prompt "Enable functions for printing module statistics" - default n + prompt "Functions for printing module statistics" help Enable functions for printing module statistics diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 730079ace277..eadd80926754 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -94,7 +94,7 @@ config SYSTEM_WORKQUEUE_STACK_SIZE default 2048 if BT_LL_SOFTDEVICE config BT_CTLR_SDC_LLPM - bool "Enable Low Latency Packet Mode support" + bool "Low Latency Packet Mode support" select BT_CONN_PARAM_ANY if !BT_HCI_RAW depends on (SOC_SERIES_NRF52X || SOC_SERIES_NRF54LX || SOC_SERIES_NRF54HX || \ SOC_SERIES_BSIM_NRF52X || SOC_SERIES_BSIM_NRF54LX) @@ -103,7 +103,7 @@ config BT_CTLR_SDC_LLPM which lets the application use connection intervals down to 1 ms. config BT_CTLR_SDC_QOS_CHANNEL_SURVEY - bool "Enable channel survey" + bool "Channel survey" select EXPERIMENTAL help Channel survey feature support @@ -149,7 +149,7 @@ config BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT the number of bytes configured with BT_CTLR_MIN_VAL_OF_MAX_ACL_TX_PAYLOAD_DEFAULT. config BT_CTLR_SDC_CONN_EVENT_EXTEND_DEFAULT - bool "Enable connection event extension by default" + bool "Connection event extension by default" default y if !NRF_802154_RADIO_DRIVER help When Extended Connection Events are disabled, the maximum connection event length is @@ -274,7 +274,7 @@ config BT_CTLR_SDC_RX_PRIO # CONFIG_BT_CTLR_DF is declared in Zephyr and also here for a second time, # to avoid BT_CTLR_DF_SUPPORT dependency. config BT_CTLR_DF - bool "Enable CTE Transmitter support" + bool "CTE Transmitter support" help Enable support for the Bluetooth v5.1 Connectionless CTE Transmitter and the Connection CTE transmitter features in the controller. @@ -634,7 +634,7 @@ config BT_CTLR_SDC_CS_MULTIPLE_ANTENNA_SUPPORT Internal helper config. Not intended for use. config BT_CTLR_SDC_CS_STEP_MODE3 - bool "Enable optional step mode-3 support" + bool "Optional step mode-3 support" depends on BT_CTLR_CHANNEL_SOUNDING help Enable optional step mode-3 support. Channel sounding will not automatically start using step mode-3 if this diff --git a/subsys/bluetooth/mesh/Kconfig.dk_prov b/subsys/bluetooth/mesh/Kconfig.dk_prov index a8d0cacef72b..ab610da416eb 100644 --- a/subsys/bluetooth/mesh/Kconfig.dk_prov +++ b/subsys/bluetooth/mesh/Kconfig.dk_prov @@ -16,17 +16,17 @@ menuconfig BT_MESH_DK_PROV if BT_MESH_DK_PROV config BT_MESH_DK_PROV_OOB_BLINK - bool "Enable blink output OOB method" + bool "Blink output OOB method" depends on DK_LIBRARY default y config BT_MESH_DK_PROV_OOB_BUTTON - bool "Enable button input OOB method" + bool "Button input OOB method" depends on DK_LIBRARY default y config BT_MESH_DK_PROV_OOB_LOG - bool "Enable log based OOB methods" + bool "Log based OOB methods" depends on LOG_PRINTK default y diff --git a/subsys/bluetooth/mesh/Kconfig.sensor b/subsys/bluetooth/mesh/Kconfig.sensor index 1c3ffbfc7adb..fd548344b54f 100644 --- a/subsys/bluetooth/mesh/Kconfig.sensor +++ b/subsys/bluetooth/mesh/Kconfig.sensor @@ -11,7 +11,7 @@ menu "Bluetooth Mesh Sensors" visible if BT_MESH_SENSOR config BT_MESH_SENSOR_LABELS - bool "Enable Sensor labels" + bool "Sensor labels" help Controls the availability of sensor labels for channels and units diff --git a/subsys/bluetooth/services/cgms/Kconfig.cgms b/subsys/bluetooth/services/cgms/Kconfig.cgms index f773c60e84ed..2656275d7d6a 100644 --- a/subsys/bluetooth/services/cgms/Kconfig.cgms +++ b/subsys/bluetooth/services/cgms/Kconfig.cgms @@ -5,7 +5,7 @@ # menuconfig BT_CGMS - bool "Enable GATT continuous glucose service" + bool "GATT continuous glucose service" select EXPERIMENTAL select BT_NRF_SERVICES diff --git a/subsys/bluetooth/services/fast_pair/adv_manager/Kconfig b/subsys/bluetooth/services/fast_pair/adv_manager/Kconfig index a5678d940dbc..bcdf778a5e78 100644 --- a/subsys/bluetooth/services/fast_pair/adv_manager/Kconfig +++ b/subsys/bluetooth/services/fast_pair/adv_manager/Kconfig @@ -5,7 +5,7 @@ # config BT_FAST_PAIR_ADV_MANAGER - bool "Enable the Fast Pair advertising manager" + bool "Fast Pair advertising manager" depends on BT_PERIPHERAL depends on BT_EXT_ADV depends on BT_PRIVACY diff --git a/subsys/bluetooth/services/fast_pair/fmdn/Kconfig b/subsys/bluetooth/services/fast_pair/fmdn/Kconfig index 524cc828bde9..7f1c2b127a80 100644 --- a/subsys/bluetooth/services/fast_pair/fmdn/Kconfig +++ b/subsys/bluetooth/services/fast_pair/fmdn/Kconfig @@ -240,7 +240,7 @@ config BT_FAST_PAIR_FMDN_CLOCK_NVM_UPDATE_RETRY_TIME endif # BT_FAST_PAIR_FMDN_CLOCK config BT_FAST_PAIR_FMDN_DULT - bool "Enable Detecting Unwanted Location Trackers (DULT) support in FMDN" + bool "Detecting Unwanted Location Trackers (DULT) support in FMDN" default y select DULT help @@ -334,7 +334,7 @@ config BT_FAST_PAIR_FMDN_DULT_FIRMWARE_VERSION_REVISION endmenu config BT_FAST_PAIR_FMDN_DULT_MOTION_DETECTOR - bool "Enable DULT Motion detector support in FMDN" + bool "DULT Motion detector support in FMDN" select DULT_MOTION_DETECTOR select BT_FAST_PAIR_FMDN_DULT_CAPABILITY_MOTION_DETECTOR_UT help 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 1785dbfce973..843446a703bd 100644 --- a/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage +++ b/subsys/bluetooth/services/fast_pair/fp_storage/Kconfig.fp_storage @@ -21,7 +21,7 @@ config BT_FAST_PAIR_STORAGE_MANAGER Add Fast Pair storage manager source files. config BT_FAST_PAIR_STORAGE_USER_RESET_ACTION - bool "Enable user reset action during factory reset" + bool "User reset action during factory reset" help Enable user reset action that executes together with the Fast Pair factory reset operation within the bt_fast_pair_factory_reset API function. To define the user reset diff --git a/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov b/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov index 97787703ca26..472076b5d29e 100644 --- a/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov +++ b/subsys/bluetooth/services/wifi_prov/Kconfig.wifi_prov @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # menuconfig BT_WIFI_PROV - bool "Enable Wi-Fi provisioning service" + bool "Wi-Fi provisioning service" select BT_NRF_SERVICES depends on NANOPB depends on NET_L2_WIFI_MGMT diff --git a/subsys/bootloader/Kconfig b/subsys/bootloader/Kconfig index f2f9d5e4f02a..d3aa04d5cef3 100644 --- a/subsys/bootloader/Kconfig +++ b/subsys/bootloader/Kconfig @@ -18,7 +18,7 @@ config SECURE_BOOT if SECURE_BOOT config SB_MONOTONIC_COUNTER - bool "Enable HW monotonic version counter" + bool "HW monotonic version counter" default y help The counter stores the current firmware version in a way that ensures that the value @@ -94,7 +94,7 @@ menuconfig IS_SECURE_BOOTLOADER if IS_SECURE_BOOTLOADER config SB_BPROT_IN_DEBUG - bool "Enable block protect in debug" + bool "Block protect in debug" default y depends on (HAS_HW_NRF_BPROT || HAS_HW_NRF_MPU) diff --git a/subsys/bootloader/bl_validation/Kconfig b/subsys/bootloader/bl_validation/Kconfig index b30aa09d4361..435c1c28f61f 100644 --- a/subsys/bootloader/bl_validation/Kconfig +++ b/subsys/bootloader/bl_validation/Kconfig @@ -7,7 +7,7 @@ menu "Secure Boot firmware validation" config SECURE_BOOT_VALIDATION - bool "Enable Secure Boot validation code" + bool "Secure Boot validation" select FW_INFO depends on SECURE_BOOT_CRYPTO depends on SECURE_BOOT_STORAGE diff --git a/subsys/caf/events/Kconfig b/subsys/caf/events/Kconfig index fe46c9b5c838..b421e156dfac 100644 --- a/subsys/caf/events/Kconfig +++ b/subsys/caf/events/Kconfig @@ -7,7 +7,7 @@ menu "Event options" config CAF_PM_EVENTS - bool "Enable power management events" + bool "Power management events" help Enable support for power management events. If this config is enabled, predefined modules can create power management events. @@ -31,7 +31,7 @@ config CAF_INIT_LOG_WAKE_UP_EVENTS default y config CAF_BLE_COMMON_EVENTS - bool "Enable BLE common events" + bool "BLE common events" help Enable support for BLE common events. @@ -66,7 +66,7 @@ config CAF_INIT_LOG_BLE_PEER_CONN_PARAMS_EVENTS default y config CAF_BLE_SMP_TRANSFER_EVENTS - bool "Enable BLE SMP events" + bool "BLE SMP events" help Enable support for BLE SMP transfer events. @@ -77,7 +77,7 @@ config CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS default y config CAF_BUTTON_EVENTS - bool "Enable button events" + bool "Button events" help Enable support for button events. @@ -88,7 +88,7 @@ config CAF_INIT_LOG_BUTTON_EVENTS default y config CAF_CLICK_EVENTS - bool "Enable click events" + bool "Click events" help Enable support for click events. @@ -99,7 +99,7 @@ config CAF_INIT_LOG_CLICK_EVENTS default y config CAF_LED_EVENTS - bool "Enable LED events" + bool "LED events" help Enable support for LED event. @@ -121,7 +121,7 @@ config CAF_INIT_LOG_LED_READY_EVENTS effect. config CAF_NET_STATE_EVENTS - bool "Enable network state events" + bool "Network state events" help Enable support for network state events. diff --git a/subsys/caf/events/Kconfig.factory_reset_event b/subsys/caf/events/Kconfig.factory_reset_event index ae3fd40a0acb..a4d4e62890ec 100644 --- a/subsys/caf/events/Kconfig.factory_reset_event +++ b/subsys/caf/events/Kconfig.factory_reset_event @@ -5,7 +5,7 @@ # config CAF_FACTORY_RESET_EVENTS - bool "Enable factory reset events" + bool "Factory reset events" help Enable the event that informs the system that factory reset was requested. diff --git a/subsys/caf/events/Kconfig.force_power_down_event b/subsys/caf/events/Kconfig.force_power_down_event index 039820dafde7..05acdc1cb1da 100644 --- a/subsys/caf/events/Kconfig.force_power_down_event +++ b/subsys/caf/events/Kconfig.force_power_down_event @@ -5,7 +5,7 @@ # config CAF_FORCE_POWER_DOWN_EVENTS - bool "Enable force Power down event" + bool "Force Power down event" help Enable power manager event to put the device into power down mode when processed. It means the power down would be processed without the delay that is diff --git a/subsys/caf/events/Kconfig.keep_alive_event b/subsys/caf/events/Kconfig.keep_alive_event index 34e1af94be96..ac3da5848337 100644 --- a/subsys/caf/events/Kconfig.keep_alive_event +++ b/subsys/caf/events/Kconfig.keep_alive_event @@ -5,7 +5,7 @@ # config CAF_KEEP_ALIVE_EVENTS - bool "Enable keep alive events" + bool "Keep alive events" help This enables keep alive event. This event is processed by power manager and reschedule power down timer. diff --git a/subsys/caf/events/Kconfig.module_state_event b/subsys/caf/events/Kconfig.module_state_event index cb50232d3d79..c749b6aab72f 100644 --- a/subsys/caf/events/Kconfig.module_state_event +++ b/subsys/caf/events/Kconfig.module_state_event @@ -5,7 +5,7 @@ # config CAF_MODULE_STATE_EVENTS - bool "Enable module state events" + bool "Module state events" help Enable support for module state events. diff --git a/subsys/caf/events/Kconfig.sensor_event b/subsys/caf/events/Kconfig.sensor_event index 8f1eb3cb2017..9ce884ab84df 100644 --- a/subsys/caf/events/Kconfig.sensor_event +++ b/subsys/caf/events/Kconfig.sensor_event @@ -5,7 +5,7 @@ # config CAF_SENSOR_EVENTS - bool "Enable sensor events" + bool "Sensor events" help Enable support for sensor events. diff --git a/subsys/caf/modules/Kconfig.ble_adv b/subsys/caf/modules/Kconfig.ble_adv index 1b0c5116cde8..63bef0306313 100644 --- a/subsys/caf/modules/Kconfig.ble_adv +++ b/subsys/caf/modules/Kconfig.ble_adv @@ -5,7 +5,7 @@ # menuconfig CAF_BLE_ADV - bool "Enable Bluetooth LE advertising" + bool "Bluetooth LE advertising" depends on BT_PERIPHERAL depends on CAF_BLE_COMMON_EVENTS depends on CAF_BLE_STATE @@ -47,7 +47,7 @@ config CAF_BLE_ADV_DIRECT_ADV if the remote device supports the address resolution of directed advertisements. config CAF_BLE_ADV_FAST_ADV - bool "Enable period of fast advertising" + bool "Period of fast advertising" config CAF_BLE_ADV_SLOW_INT_MIN hex "Minimum Advertising Interval during slow advertising (N * 0.625 milliseconds)" @@ -117,7 +117,7 @@ config CAF_BLE_ADV_FAST_ADV_TIMEOUT endif config CAF_BLE_ADV_FILTER_ACCEPT_LIST - bool "Enable filter accept list" + bool "Filter accept list" select BT_FILTER_ACCEPT_LIST select BT_CTLR_FILTER_ACCEPT_LIST if HAS_BT_CTLR select BT_CTLR_PRIVACY if HAS_BT_CTLR @@ -128,7 +128,7 @@ config CAF_BLE_ADV_FILTER_ACCEPT_LIST data. config CAF_BLE_ADV_GRACE_PERIOD - bool "Enable grace period feature" + bool "Grace period feature" depends on CAF_BLE_ADV_PM_EVENTS default y if BT_ADV_PROV_SWIFT_PAIR help diff --git a/subsys/caf/modules/Kconfig.ble_bond b/subsys/caf/modules/Kconfig.ble_bond index aab17f17e288..c71a447dcb23 100644 --- a/subsys/caf/modules/Kconfig.ble_bond +++ b/subsys/caf/modules/Kconfig.ble_bond @@ -5,7 +5,7 @@ # menuconfig CAF_BLE_BOND - bool "Enable CAF implementation of Bluetooth LE bond" + bool "CAF implementation of Bluetooth LE bond" depends on BT_BONDABLE depends on BT_SETTINGS depends on CAF_SETTINGS_LOADER diff --git a/subsys/caf/modules/Kconfig.ble_state b/subsys/caf/modules/Kconfig.ble_state index 1f9cee53b562..ddd0d03d410b 100644 --- a/subsys/caf/modules/Kconfig.ble_state +++ b/subsys/caf/modules/Kconfig.ble_state @@ -38,7 +38,7 @@ config CAF_BLE_STATE_MAX_LOCAL_ID_BONDS default 0 config CAF_BLE_STATE_PM - bool "Enable bluetooth LE power manager integration" + bool "Bluetooth LE power manager integration" depends on CAF_BLE_STATE depends on CAF_POWER_MANAGER select CAF_KEEP_ALIVE_EVENTS @@ -57,7 +57,7 @@ config CAF_BLE_STATE_EXCHANGE_MTU hold. config CAF_BLE_USE_LLPM - bool "Enable Low Latency Packet Mode (LLPM)" + bool "Low Latency Packet Mode (LLPM)" depends on (BT_CTLR_SDC_LLPM || !HAS_BT_CTLR) depends on !SOC_SERIES_NRF53X default y if HAS_BT_CTLR diff --git a/subsys/caf/modules/Kconfig.factory_reset_request b/subsys/caf/modules/Kconfig.factory_reset_request index b86a56c64349..87179faeac64 100644 --- a/subsys/caf/modules/Kconfig.factory_reset_request +++ b/subsys/caf/modules/Kconfig.factory_reset_request @@ -7,7 +7,7 @@ menu "Factory reset request" config CAF_FACTORY_RESET_REQUEST - bool "Enable factory reset request module" + bool "Factory reset request module" select CAF_FACTORY_RESET_EVENTS help Enable module that generates initialization event with diff --git a/subsys/caf/modules/Kconfig.power_manager b/subsys/caf/modules/Kconfig.power_manager index b141bb459496..f7a629a18738 100644 --- a/subsys/caf/modules/Kconfig.power_manager +++ b/subsys/caf/modules/Kconfig.power_manager @@ -7,7 +7,7 @@ menu "Power manager" config CAF_POWER_MANAGER - bool "Enable power management" + bool "Power management" select CAF_PM_EVENTS select CAF_POWER_MANAGER_EVENTS imply POWEROFF if !SOC_SERIES_NRF54HX diff --git a/subsys/caf/modules/Kconfig.settings_loader b/subsys/caf/modules/Kconfig.settings_loader index b29a33cfb716..b4ff02e0e2af 100644 --- a/subsys/caf/modules/Kconfig.settings_loader +++ b/subsys/caf/modules/Kconfig.settings_loader @@ -17,7 +17,7 @@ config CAF_SETTINGS_LOADER_DEF_PATH Location of configuration file for settings loader module. config CAF_SETTINGS_LOADER_USE_THREAD - bool "Enable loading of setting by separate thead" + bool "Loading of settings by separate thead" help The option enables loading of settings by separate thread in background instead of use of system diff --git a/subsys/debug/cpu_load/Kconfig b/subsys/debug/cpu_load/Kconfig index 6cfa5e84fea1..fe81ebcf0a6e 100644 --- a/subsys/debug/cpu_load/Kconfig +++ b/subsys/debug/cpu_load/Kconfig @@ -5,7 +5,7 @@ # menuconfig NRF_CPU_LOAD - bool "Enable CPU load measurement" + bool "CPU load measurement" select NRFX_GPPI depends on !SOC_SERIES_NRF51X # Lack of required HW events depends on !SOC_SERIES_NRF54HX # Lack of required HW events @@ -22,7 +22,7 @@ module-str = CPU load measurement source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config" config NRF_CPU_LOAD_CMDS - bool "Enable shell commands" + bool "Shell commands" depends on SHELL default y @@ -41,7 +41,7 @@ config NRF_CPU_LOAD_LOG_INTERVAL endif # LOG config NRF_CPU_LOAD_ALIGNED_CLOCKS - bool "Enable aligned clock sources" + bool "Aligned clock sources" depends on !SOC_SERIES_NRF54LX help After enabling this option, the sleep period measurement diff --git a/subsys/debug/etb_trace/Kconfig b/subsys/debug/etb_trace/Kconfig index 5293046356e1..9e8b561f622c 100644 --- a/subsys/debug/etb_trace/Kconfig +++ b/subsys/debug/etb_trace/Kconfig @@ -5,7 +5,7 @@ # config ETB_TRACE - bool "Enable ETB trace [EXPERIMENTAL]" + bool "ETB trace [EXPERIMENTAL]" depends on SOC_SERIES_NRF91X select EXPERIMENTAL help diff --git a/subsys/debug/ppi_trace/Kconfig b/subsys/debug/ppi_trace/Kconfig index 14036d910be3..67eadf409e49 100644 --- a/subsys/debug/ppi_trace/Kconfig +++ b/subsys/debug/ppi_trace/Kconfig @@ -5,7 +5,7 @@ # config PPI_TRACE - bool "Enable PPI trace" + bool "PPI trace" select NRFX_GPIOTE select NRFX_GPPI select NRFX_PPI if HAS_HW_NRF_PPI diff --git a/subsys/dult/Kconfig b/subsys/dult/Kconfig index d1667f3721be..47b17c3267ca 100644 --- a/subsys/dult/Kconfig +++ b/subsys/dult/Kconfig @@ -149,7 +149,7 @@ config DULT_USER Add DULT user source files. config DULT_MOTION_DETECTOR - bool "Enable DULT Motion detector feature" + bool "DULT Motion detector feature" help The DULT Motion detector requests the device to ring if the accessory separated from owner is moving. For more details see @@ -158,7 +158,7 @@ config DULT_MOTION_DETECTOR if DULT_MOTION_DETECTOR config DULT_MOTION_DETECTOR_TEST_MODE - bool "Enable DULT Motion detector test mode" + bool "DULT Motion detector test mode" help The DULT Motion detector test mode allows to configure motion detector parameters for testing purposes. Those values are defined in the DULT specification and should diff --git a/subsys/mpsl/clock_ctrl/Kconfig b/subsys/mpsl/clock_ctrl/Kconfig index e3f414aafe3c..46c9eda80db1 100644 --- a/subsys/mpsl/clock_ctrl/Kconfig +++ b/subsys/mpsl/clock_ctrl/Kconfig @@ -27,7 +27,7 @@ config MPSL_EXT_CLK_CTRL_CLOCK_REQUEST_WAIT_TIMEOUT_MS it must be greater or equalt than internal clock driver timeout value. config MPSL_EXT_CLK_CTRL_NVM_CLOCK_REQUEST - bool "Enables a request for a non-volatile memory clock" + bool "Request for a non-volatile memory clock" depends on CLOCK_CONTROL_NRF_HSFLL_GLOBAL depends on SOC_SERIES_NRF54HX default y @@ -37,7 +37,7 @@ config MPSL_EXT_CLK_CTRL_NVM_CLOCK_REQUEST too slow. This is crucial to meet meet radio protocols requirements. config MPSL_EXT_CLK_CTRL_LFCLK_REQ_TIMEOUT_ALLOW - bool "Enables a workaround for LFCLK request timeout" + bool "Workaround for LFCLK request timeout" depends on SOC_SERIES_NRF54HX default y help diff --git a/subsys/net/lib/download_client/Kconfig b/subsys/net/lib/download_client/Kconfig index 15bd1a611bba..c8c1bd211c57 100644 --- a/subsys/net/lib/download_client/Kconfig +++ b/subsys/net/lib/download_client/Kconfig @@ -143,7 +143,7 @@ config DOWNLOAD_CLIENT_CID This requires modem firmware 1.3.5 or newer. config DOWNLOAD_CLIENT_SHELL - bool "Enable shell" + bool "Download shell" depends on SHELL module=DOWNLOAD_CLIENT diff --git a/subsys/net/lib/fota_download/Kconfig b/subsys/net/lib/fota_download/Kconfig index 21f438604fd3..b2830a3f63f5 100644 --- a/subsys/net/lib/fota_download/Kconfig +++ b/subsys/net/lib/fota_download/Kconfig @@ -43,7 +43,7 @@ config FOTA_DOWNLOAD_FULL_MODEM_BUF_SZ Buffer size must be aligned to the minimal flash write block size config FOTA_DOWNLOAD_NATIVE_TLS - bool "Enable native TLS socket" + bool "Native TLS socket" help Enabling this option will configure the socket to be native for TLS instead of offloading TLS operations to the modem. diff --git a/subsys/net/lib/lwm2m_client_utils/Kconfig b/subsys/net/lib/lwm2m_client_utils/Kconfig index 2eb6f997bf95..5e0bccb8b93e 100644 --- a/subsys/net/lib/lwm2m_client_utils/Kconfig +++ b/subsys/net/lib/lwm2m_client_utils/Kconfig @@ -253,14 +253,14 @@ config LWM2M_CELL_CONN_APN_PROFILE_COUNT endif #LWM2M_CLIENT_UTILS_CELL_CONN_OBJ_SUPPORT config LWM2M_CLIENT_UTILS_RAI - bool "Enable release assistance indication (RAI)" + bool "Release assistance indication (RAI)" help This option enables RAI for access stratum (AS) which was introduced in REL14. When AS RAI is configured, device may indicate that no further data is expected in the near future and the connection may be released. config LWM2M_CLIENT_UTILS_LTE_CONNEVAL - bool "Enable connection pre-evaluation [EXPERIMENTAL]" + bool "Connection pre-evaluation [EXPERIMENTAL]" select EXPERIMENTAL help Connection pre-evaluation allows the application to get an estimation of the @@ -269,7 +269,7 @@ config LWM2M_CLIENT_UTILS_LTE_CONNEVAL started. config LWM2M_CLIENT_UTILS_DTLS_CID - bool "[Deprecated] Enable DTLS Connection Identifier" + bool "DTLS Connection Identifier [DEPRECATED]" select LWM2M_DTLS_CID help Deprecated. Use CONFIG_LWM2M_DTLS_CID instead. @@ -277,7 +277,7 @@ config LWM2M_CLIENT_UTILS_DTLS_CID if LWM2M_DTLS_CID config LWM2M_CLIENT_UTILS_DTLS_CON_MANAGEMENT - bool "Enable DTLS connection save and load" + bool "DTLS connection save and load" depends on LWM2M_RD_CLIENT_STOP_POLLING_AT_IDLE help Enable DTLS connection identifier save at idle and load exit from idle. diff --git a/subsys/net/lib/nrf70_fw_ext/Kconfig b/subsys/net/lib/nrf70_fw_ext/Kconfig index d1892ca41a60..a45c01d9925d 100644 --- a/subsys/net/lib/nrf70_fw_ext/Kconfig +++ b/subsys/net/lib/nrf70_fw_ext/Kconfig @@ -49,7 +49,7 @@ config NRF_WIFI_FW_FLASH_CHUNK_SIZE RAM usage (heap) of the application. config NRF_WIFI_FW_PATCH_INTEGRITY_CHECK - bool "Enable integrity check of nRF70 FW patches" + bool "Integrity check of nRF70 FW patches" select FLASH_AREA_CHECK_INTEGRITY default y help diff --git a/subsys/net/lib/nrf_cloud/Kconfig b/subsys/net/lib/nrf_cloud/Kconfig index cb1912880573..2ad913f091fd 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig +++ b/subsys/net/lib/nrf_cloud/Kconfig @@ -77,7 +77,7 @@ config NRF_CLOUD_CERTIFICATES_FILE endif # NRF_CLOUD_PROVISION_CERTIFICATES config NRF_CLOUD_CHECK_CREDENTIALS - bool "Enable the ability to check if nRF Cloud credentials are present" + bool "Check if nRF Cloud credentials are present" choice NRF_CLOUD_CREDENTIALS_MGMT prompt "Select how credentials are managed" diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap index 07cec55e00c9..045571fbd4cf 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap @@ -43,7 +43,7 @@ config NRF_CLOUD_COAP_SERVER_PORT default 5684 config NRF_CLOUD_COAP_KEEPOPEN - bool "Enable SO_KEEPOPEN to prevent unnecessary socket closures" + bool "SO_KEEPOPEN to prevent unnecessary socket closures" default y depends on SOC_NRF9161_LACA || SOC_NRF9151_LACA || SOC_NRF9131_LACA help diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota index dbdf31d6ba9c..857cb73feec8 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota @@ -33,7 +33,7 @@ config NRF_CLOUD_FOTA_PROGRESS_PCT_INCREMENT 0 disables progress report. config NRF_CLOUD_FOTA_BLE_DEVICES - bool "Enable API for FOTA of BLE devices" + bool "API for FOTA of BLE devices" depends on BT endif # NRF_CLOUD_FOTA diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_location b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_location index 950572ad03ec..82722099ccbe 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_location +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_location @@ -8,7 +8,7 @@ menu "Location" menu "Cellular/Wi-Fi" config NRF_CLOUD_LOCATION - bool "Enable nRF Cloud Location (cellular and/or Wi-Fi) over MQTT" + bool "nRF Cloud Location (cellular and/or Wi-Fi) over MQTT" imply FPU depends on NRF_CLOUD_MQTT select CJSON_LIB @@ -50,8 +50,9 @@ config NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_MAC_RSSI config NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_ALL bool "Encode all available parameters" help - This option increases the memory required for creating requests. - It also increases the amount of data sent to nRF Cloud. + This option increases the memory required for creating requests. + It also increases the amount of data sent to nRF Cloud. + endchoice endmenu diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_mqtt b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_mqtt index a546241ec986..bb2926cb6e6f 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_mqtt +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_mqtt @@ -19,7 +19,7 @@ menuconfig $(module) if NRF_CLOUD_MQTT config NRF_CLOUD_STATIC_IPV4 - bool "Enable use of static IPv4" + bool "Static IPv4" depends on NET_IPV4 config NRF_CLOUD_STATIC_IPV4_ADDR @@ -111,7 +111,7 @@ config NRF_CLOUD_MQTT_UA_WAIT_KEEPALIVE more rapidly for better user experience. config NRF_CLOUD_MQTT_SHADOW_TRANSFORMS - bool "Enable requesting shadow data using a JSONata expression" + bool "Request shadow data using a JSONata expression" help This feature allows the device to request specific parts of its shadow. diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_shadow_info b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_shadow_info index a75105e3621a..72c248292442 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_shadow_info +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_shadow_info @@ -68,43 +68,43 @@ menuconfig NRF_CLOUD_SEND_SERVICE_INFO_UI if NRF_CLOUD_SEND_SERVICE_INFO_UI config NRF_CLOUD_ENABLE_SVC_INF_UI_MAP - bool "Enable map card on nRF Cloud [DEPRECATED]" + bool "Map card on nRF Cloud [DEPRECATED]" select DEPRECATED default y config NRF_CLOUD_ENABLE_SVC_INF_UI_RSRP - bool "Enable RSRP card on nRF Cloud [DEPRECATED]" + bool "RSRP card on nRF Cloud [DEPRECATED]" select DEPRECATED default y if NRF_MODEM_LIB config NRF_CLOUD_ENABLE_SVC_INF_UI_LOGS - bool "Enable log card on nRF Cloud [DEPRECATED]" + bool "Log card on nRF Cloud [DEPRECATED]" select DEPRECATED default y if NRF_CLOUD_LOG_TEXT_LOGGING_ENABLED config NRF_CLOUD_ENABLE_SVC_INF_UI_BIN_LOGS - bool "Enable binary (dictionary-based) log card on nRF Cloud [DEPRECATED]" + bool "Binary (dictionary-based) log card on nRF Cloud [DEPRECATED]" select DEPRECATED default y if NRF_CLOUD_LOG_DICTIONARY_LOGGING_ENABLED config NRF_CLOUD_ENABLE_SVC_INF_UI_TEMP - bool "Enable temperature card on nRF Cloud [DEPRECATED]" + bool "Temperature card on nRF Cloud [DEPRECATED]" select DEPRECATED config NRF_CLOUD_ENABLE_SVC_INF_UI_HUMID - bool "Enable humidity card on nRF Cloud [DEPRECATED]" + bool "Humidity card on nRF Cloud [DEPRECATED]" select DEPRECATED config NRF_CLOUD_ENABLE_SVC_INF_UI_AIR_PRESSURE - bool "Enable air pressure card on nRF Cloud [DEPRECATED]" + bool "Air pressure card on nRF Cloud [DEPRECATED]" select DEPRECATED config NRF_CLOUD_ENABLE_SVC_INF_UI_AIR_QUALITY - bool "Enable air quality card on nRF Cloud [DEPRECATED]" + bool "Air quality card on nRF Cloud [DEPRECATED]" select DEPRECATED config NRF_CLOUD_ENABLE_SVC_INF_UI_ORIENTATION - bool "Enable orientation (flip) card on nRF Cloud [DEPRECATED]" + bool "Orientation (flip) card on nRF Cloud [DEPRECATED]" select DEPRECATED endif # NRF_CLOUD_SEND_SERVICE_INFO_UI diff --git a/subsys/nrf_profiler/Kconfig b/subsys/nrf_profiler/Kconfig index 10f3e5dd6b3c..0cb55d4db80f 100644 --- a/subsys/nrf_profiler/Kconfig +++ b/subsys/nrf_profiler/Kconfig @@ -25,7 +25,7 @@ config NRF_PROFILER_MAX_LENGTH_OF_CUSTOM_EVENTS_DESCRIPTIONS default 128 config NRF_PROFILER_SHELL - bool "Enable shell integration" + bool "Shell integration" depends on SHELL default y help diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig index 61f0d08b1104..8dd4ecce5584 100644 --- a/subsys/nrf_security/Kconfig +++ b/subsys/nrf_security/Kconfig @@ -31,7 +31,7 @@ config NORDIC_SECURITY_BACKEND config NRF_SECURITY bool - prompt "Enable nRF Security" if !PSA_PROMPTLESS + prompt "nRF Security" if !PSA_PROMPTLESS depends on SOC_FAMILY_NORDIC_NRF default y if BUILD_WITH_TFM # entropy is provided by PSA and NRF_SECURITY on NRF54LX and NRF71X @@ -86,7 +86,7 @@ config MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE This file is auto-generated with the values of the relevant Kconfig options. config MBEDTLS_ENABLE_HEAP - bool "Enable global heap for mbed TLS" + bool "Global heap for mbed TLS" help This option enables the mbedtls to use the heap. This setting must be global so that various applications and libraries in Zephyr do not @@ -142,7 +142,7 @@ menu "Zephyr legacy configurations" depends on MBEDTLS_LIBRARY_NRF_SECURITY config MBEDTLS_TLS_VERSION_1_2 - bool "Enable support for TLS 1.2 (DTLS 1.2)" + bool "Support for TLS 1.2 (DTLS 1.2)" select PSA_WANT_ALG_SHA_1 select PSA_WANT_ALG_SHA_224 select PSA_WANT_ALG_SHA_256 @@ -151,26 +151,26 @@ config MBEDTLS_TLS_VERSION_1_2 select MBEDTLS_CIPHER config MBEDTLS_DTLS - bool "Enable support for DTLS" + bool "Support for DTLS" depends on MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_SSL_PROTO_TLS1_2 select MBEDTLS_SSL_PROTO_DTLS config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED - bool "Enable all available ciphersuites" + bool "All available ciphersuites" help The default behaviour with nrf_security is to always enable every ciphersuite that is available. This configuration has no effect, but ensures that samples and subsystem usage doesn't break. config MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED - bool "Enable some PSK ciphersuites" + bool "Some PSK ciphersuites" help The default behaviour of nrf_security is to always enable some ciphersuites. This configuration has no effect but ensures that samples and subsystem usage doesn't break. config MBEDTLS_ECP_ALL_ENABLED - bool "Enable all available elliptic curves" + bool "All available elliptic curves" select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT @@ -190,7 +190,7 @@ config MBEDTLS_ECP_ALL_ENABLED select PSA_WANT_ECC_MONTGOMERY_448 config MBEDTLS_CIPHER_ALL_ENABLED - bool "Enable all available ciphers" + bool "All available ciphers" select PSA_WANT_KEY_TYPE_AES select PSA_WANT_ALG_ECB_NO_PADDING select PSA_WANT_ALG_CBC_NO_PADDING @@ -203,7 +203,7 @@ config MBEDTLS_CIPHER_ALL_ENABLED select PSA_WANT_ALG_STREAM_CIPHER config MBEDTLS_MAC_ALL_ENABLED - bool "Enable all available MAC methods" + bool "All available MAC methods" select PSA_WANT_KEY_TYPE_AES select PSA_WANT_ALG_CMAC select PSA_WANT_ALG_HMAC @@ -214,7 +214,7 @@ config MBEDTLS_MAC_ALL_ENABLED select PSA_WANT_ALG_SHA_512 config MBEDTLS_MAC_SHA256_ENABLED - bool "Enable the SHA-224 and SHA-256 hash algorithms" + bool "SHA-224 and SHA-256 hash algorithms" default y select PSA_WANT_ALG_SHA_224 select PSA_WANT_ALG_SHA_256 @@ -224,24 +224,24 @@ config MBEDTLS_MAC_MD5_ENABLED bool "MD5 hash algorithm" config MBEDTLS_CTR_DRBG_ENABLED - bool "Enable the CTR_DRBG AES-256-based random generator" + bool "CTR_DRBG AES-256-based random generator" select PSA_WANT_ALG_CTR_DRBG config MBEDTLS_HMAC_DRBG_ENABLED - bool "Enable the HMAC_DRBG random generator" + bool "HMAC_DRBG random generator" select PSA_WANT_ALG_HMAC_DRBG config MBEDTLS_CIPHER - bool "Enable the generic cipher layer" + bool "Generic cipher layer" config MBEDTLS_MD - bool "Enable the generic message digest layer" + bool "Generic message digest layer" config MBEDTLS_ENTROPY_ENABLED - bool "Enable mbedTLS generic entropy pool" + bool "mbedTLS generic entropy pool" config MBEDTLS_GENPRIME_ENABLED - bool "Enable the prime-number generation code" + bool "Prime-number generation code" endmenu # Zephyr legacy configurations diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy index fa1f83ec4046..edba5dea9431 100644 --- a/subsys/nrf_security/Kconfig.legacy +++ b/subsys/nrf_security/Kconfig.legacy @@ -300,7 +300,7 @@ config MBEDTLS_LEGACY_CRYPTO_C_SILENCE_DEPRECATION config MBEDTLS_LEGACY_CRYPTO_C bool - prompt "Enable (legacy) mbed TLS crypto APIs" + prompt "(Legacy) mbed TLS crypto APIs" select DEPRECATED if !MBEDTLS_LEGACY_CRYPTO_C_SILENCE_DEPRECATION help Enable support for legacy mbed TLS APIs. @@ -414,7 +414,7 @@ menu "CBC cipher padding modes" config MBEDTLS_CIPHER_PADDING_PKCS7 bool - prompt "Enable MBEDTLS_CIPHER_PADDING_PKCS7" + prompt "MBEDTLS_CIPHER_PADDING_PKCS7" default y if !OPENTHREAD select PSA_WANT_ALG_CBC_PKCS7 if PSA_CRYPTO_CLIENT select PSA_WANT_KEY_TYPE_AES if PSA_CRYPTO_CLIENT @@ -424,7 +424,7 @@ config MBEDTLS_CIPHER_PADDING_PKCS7 config MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS bool - prompt "Enable MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS" + prompt "MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS" default y help Enable support for one and zeros padding for CBC cipher functions in mbedTLS. @@ -432,7 +432,7 @@ config MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS config MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN bool - prompt "Enable MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN" + prompt "MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN" default y help Enable support for zeros and length padding for CBC cipher functions in mbedTLS. @@ -440,7 +440,7 @@ config MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN config MBEDTLS_CIPHER_PADDING_ZEROS bool - prompt "Enable MBEDTLS_CIPHER_PADDING_ZEROS" + prompt "MBEDTLS_CIPHER_PADDING_ZEROS" default y help Enable support for zeros padding for CBC cipher functions in mbedTLS. @@ -460,7 +460,7 @@ endmenu # CBC cipher padding modes config MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH bool - prompt "Enable MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH" + prompt "MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH" help Enable AES operations to support only 128-bit keys to reduce ROM usage. @@ -591,7 +591,7 @@ config MBEDTLS_ECDSA_C MBEDTLS_ECDSA_C setting in mbed TLS config file. config MBEDTLS_ECDSA_DETERMINISTIC - bool "Enable deterministic ECDSA (RFC 6979)" + bool "Deterministic ECDSA (RFC 6979)" select MBEDTLS_HMAC_DRBG_C if !PSA_CRYPTO_CLIENT depends on MBEDTLS_ECDSA_C default y if !MBEDTLS_USE_PSA_CRYPTO @@ -612,7 +612,7 @@ config MBEDTLS_ECJPAKE_C menu "ECC curves" config MBEDTLS_ECP_DP_SECP192R1_ENABLED - bool "Enable NIST curve secp192r1" + bool "NIST curve secp192r1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_R1_192 if PSA_CRYPTO_CLIENT @@ -620,21 +620,21 @@ config MBEDTLS_ECP_DP_SECP192R1_ENABLED MBEDTLS_ECP_DP_SECP192R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP224R1_ENABLED - bool "Enable NIST curve secp224r1" + bool "NIST curve secp224r1" select PSA_WANT_ECC_SECP_R1_224 if PSA_CRYPTO_CLIENT default n help MBEDTLS_ECP_DP_SECP224R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP256R1_ENABLED - bool "Enable NIST curve secp256r1" + bool "NIST curve secp256r1" default y select PSA_WANT_ECC_SECP_R1_256 if PSA_CRYPTO_CLIENT help MBEDTLS_ECP_DP_SECP256R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP384R1_ENABLED - bool "Enable NIST curve secp384r1" + bool "NIST curve secp384r1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_R1_384 if PSA_CRYPTO_CLIENT @@ -642,7 +642,7 @@ config MBEDTLS_ECP_DP_SECP384R1_ENABLED MBEDTLS_ECP_DP_SECP384R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP521R1_ENABLED - bool "Enable NIST curve secp521r1" + bool "NIST curve secp521r1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_R1_521 if PSA_CRYPTO_CLIENT @@ -650,7 +650,7 @@ config MBEDTLS_ECP_DP_SECP521R1_ENABLED MBEDTLS_ECP_DP_SECP521R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP192K1_ENABLED - bool "Enable Koblitz curve secp192k1" + bool "Koblitz curve secp192k1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_R1_192 if PSA_CRYPTO_CLIENT @@ -658,7 +658,7 @@ config MBEDTLS_ECP_DP_SECP192K1_ENABLED MBEDTLS_ECP_DP_SECP192K1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP224K1_ENABLED - bool "Enable Koblitz curve secp224k1" + bool "Koblitz curve secp224k1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_K1_224 if PSA_CRYPTO_CLIENT @@ -666,7 +666,7 @@ config MBEDTLS_ECP_DP_SECP224K1_ENABLED MBEDTLS_ECP_DP_SECP224K1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_SECP256K1_ENABLED - bool "Enable Koblitz curve secp256k1" + bool "Koblitz curve secp256k1" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_SECP_K1_256 if PSA_CRYPTO_CLIENT @@ -674,7 +674,7 @@ config MBEDTLS_ECP_DP_SECP256K1_ENABLED MBEDTLS_ECP_DP_SECP256K1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_BP256R1_ENABLED - bool "Enable Brainpool curve bp256r1" + bool "Brainpool curve bp256r1" depends on !OBERON_BACKEND depends on !CC3XX_BACKEND default n @@ -683,7 +683,7 @@ config MBEDTLS_ECP_DP_BP256R1_ENABLED MBEDTLS_ECP_DP_BP256R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_BP384R1_ENABLED - bool "Enable Brainpool curve bp384r1" + bool "Brainpool curve bp384r1" depends on !OBERON_BACKEND depends on !CC3XX_BACKEND default n @@ -692,7 +692,7 @@ config MBEDTLS_ECP_DP_BP384R1_ENABLED MBEDTLS_ECP_DP_BP384R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_BP512R1_ENABLED - bool "Enable Brainpool curve bp512r1" + bool "Brainpool curve bp512r1" depends on !OBERON_BACKEND depends on !CC3XX_BACKEND default n @@ -701,7 +701,7 @@ config MBEDTLS_ECP_DP_BP512R1_ENABLED MBEDTLS_ECP_DP_BP512R1_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_CURVE25519_ENABLED - bool "Enable Curve25519" + bool "Curve25519" depends on !OBERON_BACKEND default n select PSA_WANT_ECC_MONTGOMERY_255 if PSA_CRYPTO_CLIENT @@ -710,7 +710,7 @@ config MBEDTLS_ECP_DP_CURVE25519_ENABLED MBEDTLS_ECP_DP_CURVE25519_ENABLED setting in mbed TLS config file. config MBEDTLS_ECP_DP_CURVE448_ENABLED - bool "Enable Curve448" + bool "Curve448" depends on !OBERON_BACKEND depends on !CC3XX_BACKEND default n @@ -852,34 +852,34 @@ endif #MBEDTLS_LEGACY_CRYPTO_C config MBEDTLS_CIPHER_C bool - prompt "Enable Cipher support" + prompt "Cipher support" default y if MBEDTLS_LEGACY_CRYPTO_C config MBEDTLS_MD_C bool - prompt "Enable MD support" + prompt "MD support" default y if MBEDTLS_LEGACY_CRYPTO_C || MBEDTLS_TLS_LIBRARY config MBEDTLS_PK_C bool - prompt "Enable PK support" + prompt "PK support" default y if MBEDTLS_TLS_LIBRARY config MBEDTLS_PKCS5_C bool - prompt "Enable PKCS5 support" + prompt "PKCS5 support" default y depends on MBEDTLS_MD_C depends on MBEDTLS_CIPHER_PADDING_PKCS7 config MBEDTLS_PK_WRITE_C bool - prompt "Enable PK write support" + prompt "PK write support" depends on MBEDTLS_PK_C config MBEDTLS_PK_PARSE_C bool - prompt "Enable PK parse support" + prompt "PK parse support" default y if MBEDTLS_TLS_LIBRARY depends on MBEDTLS_PK_C diff --git a/subsys/nrf_security/Kconfig.psa b/subsys/nrf_security/Kconfig.psa index 93a436df4e31..45f45085968e 100644 --- a/subsys/nrf_security/Kconfig.psa +++ b/subsys/nrf_security/Kconfig.psa @@ -6,7 +6,7 @@ config MBEDTLS_PSA_CRYPTO_C bool - prompt "Enable PSA crypto APIs" + prompt "PSA crypto APIs" default y help Enable the Platform Security Architecture cryptography API. diff --git a/subsys/nrf_security/Kconfig.tls b/subsys/nrf_security/Kconfig.tls index 116f4e8e62c6..eeb349cfd730 100644 --- a/subsys/nrf_security/Kconfig.tls +++ b/subsys/nrf_security/Kconfig.tls @@ -91,7 +91,7 @@ menuconfig MBEDTLS_TLS_LIBRARY if MBEDTLS_TLS_LIBRARY config MBEDTLS_SSL_CLI_C - bool "Enable the SSL/TLS client code" + bool "SSL/TLS client code" default y depends on MBEDTLS_SSL_TLS_C help @@ -99,7 +99,7 @@ config MBEDTLS_SSL_CLI_C Corresponds to MBEDTLS_SSL_CLI_C in mbed TLS config file config MBEDTLS_SSL_SRV_C - bool "Enable the SSL/TLS server code" + bool "SSL/TLS server code" default y depends on MBEDTLS_SSL_TLS_C help @@ -114,7 +114,7 @@ config MBEDTLS_SSL_TLS_C Corresponds to MBEDTLS_SSL_TLS_C in mbed TLS config file config MBEDTLS_SSL_PROTO_TLS1_2 - bool "Enable TLS version 1.2 protocol" + bool "TLS version 1.2 protocol" default y depends on (MBEDTLS_SHA1_C || MBEDTLS_SHA256_C || MBEDTLS_SHA512_C) || \ MBEDTLS_PSA_CRYPTO_C @@ -143,7 +143,7 @@ config MBEDTLS_SSL_EXTENDED_MASTER_SECRET config MBEDTLS_SSL_COOKIE_C bool - prompt "Enable TLS server-side callbacks for session tickets" + prompt "TLS server-side callbacks for session tickets" depends on MBEDTLS_SSL_SRV_C default y help @@ -156,7 +156,7 @@ config MBEDTLS_TLS_VERSION_1_3 config MBEDTLS_DEBUG_C bool - prompt "Enable the debug functions for TLS." + prompt "Debug functions for TLS" select CBPRINTF_PACKAGE_LONGDOUBLE help Enable the debug functions for TLS. @@ -183,7 +183,7 @@ config MBEDTLS_MEMORY_DEBUG issues. Enables function for 'debug output' of allocated memory. config MBEDTLS_SSL_PROTO_DTLS - bool "Enable support for DTLS" + bool "DTLS" depends on MBEDTLS_SSL_PROTO_TLS1_2 help Enables all version of DTLS @@ -198,14 +198,14 @@ config MBEDTLS_SSL_DTLS_ANTI_REPLAY See mbedtls_ssl_conf_dtls_anti_replay() for details. config MBEDTLS_SSL_DTLS_HELLO_VERIFY - bool "Enable support for HellyVerifyRequiest on DTLS servers" + bool "HelloVerifyRequest on DTLS servers" default y help Enable this to ensure DTLS servers can't be used in certain DoS attacks. config MBEDTLS_SSL_DTLS_SRTP - bool "Enable DTLS-SRTP (RFC5764)" + bool "DTLS-SRTP (RFC5764)" config MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE bool @@ -241,7 +241,7 @@ config MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME config MBEDTLS_SSL_ALL_ALERT_MESSAGES bool - prompt "Enable all SSL alert messages" + prompt "All SSL alert messages" default y help This setting enables alert messages beingsentin case of failures. @@ -251,7 +251,7 @@ config MBEDTLS_SSL_ALL_ALERT_MESSAGES config MBEDTLS_SSL_CONTEXT_SERIALIZATION bool - prompt "Enable serialization of TLS conftext structures" + prompt "Serialization of TLS conftext structures" default y help This setting enables serialization of TLS structures, through use of @@ -260,7 +260,7 @@ config MBEDTLS_SSL_CONTEXT_SERIALIZATION config MBEDTLS_SSL_DEBUG_ALL bool - prompt "Enable debug messages in SSL module for all issues." + prompt "Debug messages in SSL module for all issues." help This setting enable the debug messages in SSL module for all issues. Note: Some debug messages have been enabled to prevent timing attacks. @@ -316,7 +316,7 @@ config MBEDTLS_SSL_TICKET_C config MBEDTLS_SSL_EXPORT_KEYS bool - prompt "Enable support for exporting keys" + prompt "Support for exporting keys" default y help Enables support for exporting key block and master secret. @@ -352,7 +352,7 @@ config MBEDTLS_SSL_PROTO_TLS1_3 default y config MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE - bool "Enable TLS1.3 middlebox compatibility mode" + bool "TLS1.3 middlebox compatibility mode" default y help As specified in RFC8446, TLS 1.3 offers a compatibility mode to make a TLS diff --git a/subsys/nrf_security/src/drivers/Kconfig b/subsys/nrf_security/src/drivers/Kconfig index 13c19976a3cc..137766b2db10 100644 --- a/subsys/nrf_security/src/drivers/Kconfig +++ b/subsys/nrf_security/src/drivers/Kconfig @@ -27,7 +27,7 @@ config PSA_CRYPTO_DRIVER_CC3XX all supported key sizes are included in the build. config PSA_CRYPTO_DRIVER_CRACEN - bool "Enable the Cracen PSA driver" + bool "Cracen PSA driver" depends on MBEDTLS_PSA_CRYPTO_C depends on CRACEN_HW_PRESENT # CRACEN uses the k_event_ API @@ -43,13 +43,13 @@ config PSA_WANT_PLATFORM_KEYS menu "Choose DRBG algorithm" config PSA_WANT_ALG_CTR_DRBG - prompt "Enable CTR_DRBG" + prompt "CTR_DRBG" bool default y if !PSA_WANT_ALG_HMAC_DRBG depends on PSA_WANT_GENERATE_RANDOM config PSA_WANT_ALG_HMAC_DRBG - prompt "Enable HMAC_DRBG" + prompt "HMAC_DRBG" bool depends on PSA_WANT_GENERATE_RANDOM @@ -68,7 +68,7 @@ menu "CryptoCell PSA Driver Configuration" if PSA_CRYPTO_DRIVER_CC3XX config PSA_USE_CC3XX_CIPHER_DRIVER - prompt "Enable CryptoCell driver support for the PSA cipher APIs" + prompt "CryptoCell driver support for the PSA cipher APIs" bool default y help @@ -77,7 +77,7 @@ config PSA_USE_CC3XX_CIPHER_DRIVER CBC no padding, ECB no padding and Chacha20. config PSA_USE_CC3XX_AEAD_DRIVER - prompt "Enable CryptoCell driver support for the PSA AEAD APIs" + prompt "CryptoCell driver support for the PSA AEAD APIs" bool default y help @@ -86,7 +86,7 @@ config PSA_USE_CC3XX_AEAD_DRIVER and Chacha20Poly1305. config PSA_USE_CC3XX_HASH_DRIVER - prompt "Enable CryptoCell driver support for the PSA hash APIs" + prompt "CryptoCell driver support for the PSA hash APIs" bool default y help @@ -94,7 +94,7 @@ config PSA_USE_CC3XX_HASH_DRIVER will provide support for SHA1, SHA224 and SHA256. config PSA_USE_CC3XX_MAC_DRIVER - prompt "Enable CryptoCell driver support for the PSA mac APIs" + prompt "CryptoCell driver support for the PSA mac APIs" bool default y help @@ -102,7 +102,7 @@ config PSA_USE_CC3XX_MAC_DRIVER will provide support for HMAC and CMAC. config PSA_USE_CC3XX_KEY_AGREEMENT_DRIVER - prompt "Enable CryptoCell driver support for the PSA key agreement APIs" + prompt "CryptoCell driver support for the PSA key agreement APIs" bool default y help @@ -110,7 +110,7 @@ config PSA_USE_CC3XX_KEY_AGREEMENT_DRIVER will provide support for key agreement with ECDH. config PSA_USE_CC3XX_ASYMMETRIC_SIGNATURE_DRIVER - prompt "Enable CryptoCell driver support for the PSA asymmetric signature APIs" + prompt "CryptoCell driver support for the PSA asymmetric signature APIs" bool default y help @@ -119,7 +119,7 @@ config PSA_USE_CC3XX_ASYMMETRIC_SIGNATURE_DRIVER and randomized modes and RSA in PKCS1V15 and PSS modes. config PSA_USE_CC3XX_ASYMMETRIC_ENCRYPTION_DRIVER - prompt "Enable CryptoCell driver support for the PSA asymmetric encryption APIs" + prompt "CryptoCell driver support for the PSA asymmetric encryption APIs" bool default y help @@ -128,7 +128,7 @@ config PSA_USE_CC3XX_ASYMMETRIC_ENCRYPTION_DRIVER in PKCS1V15 and OAEP modes. config PSA_USE_CC3XX_KEY_MANAGEMENT_DRIVER - prompt "Enable CryptoCell driver support for the PSA key management APIs" + prompt "CryptoCell driver support for the PSA key management APIs" bool default y depends on PSA_USE_CC3XX_ASYMMETRIC_ENCRYPTION_DRIVER || \ diff --git a/subsys/uart_async_adapter/Kconfig b/subsys/uart_async_adapter/Kconfig index 3c4e47ad6018..cd56f9772dd9 100644 --- a/subsys/uart_async_adapter/Kconfig +++ b/subsys/uart_async_adapter/Kconfig @@ -5,7 +5,7 @@ # menuconfig UART_ASYNC_ADAPTER - bool "Enable UART async adapter [EXPERIMENTAL]" + bool "UART async adapter [EXPERIMENTAL]" select EXPERIMENTAL select SERIAL_SUPPORT_ASYNC depends on SERIAL_SUPPORT_INTERRUPT diff --git a/sysbuild/Kconfig.wifi b/sysbuild/Kconfig.wifi index 7b10b55d9d32..a9a3fdb9f316 100644 --- a/sysbuild/Kconfig.wifi +++ b/sysbuild/Kconfig.wifi @@ -16,12 +16,12 @@ choice WIFI_NRF70_OPER_MODES Select the operating mode of the nRF700x driver config WIFI_NRF70_SYSTEM_MODE - bool "Enable nRF70 system mode" + bool "nRF70 system mode" help Select this option to enable system mode of the nRF700x driver config WIFI_NRF70_SCAN_ONLY - bool "Enable nRF70 scan only mode" + bool "nRF70 scan only mode" help Select this option to enable scan only mode of the nRF700x driver @@ -36,7 +36,7 @@ endchoice if WIFI_NRF70_SYSTEM_MODE config WIFI_NRF70_SYSTEM_WITH_RAW_MODES - bool "Enable nRF70 system with raw modes" + bool "nRF70 system with raw modes" help Select this option to enable nRF700x driver with raw modes endif diff --git a/tests/crypto/test_cases/test_ecdh.c b/tests/crypto/test_cases/test_ecdh.c index 58313483f292..2783a5df3828 100644 --- a/tests/crypto/test_cases/test_ecdh.c +++ b/tests/crypto/test_cases/test_ecdh.c @@ -286,11 +286,7 @@ void exec_test_case_ecdh_deterministic_full(void) &initiator_mbed_ctx->z, &responder_mbed_ctx->Q, &initiator_mbed_ctx->d, -#if defined(CONFIG_MBEDTLS_VANILLA_BACKEND) - NULL, -#else drbg_random, -#endif NULL); stop_time_measurement(); @@ -309,11 +305,7 @@ void exec_test_case_ecdh_deterministic_full(void) &responder_mbed_ctx->z, &initiator_mbed_ctx->Q, &responder_mbed_ctx->d, -#if defined(CONFIG_MBEDTLS_VANILLA_BACKEND) - NULL, -#else drbg_random, -#endif NULL); TEST_VECTOR_ASSERT_EQUAL(p_test_vector->expected_err_code, err_code); @@ -397,11 +389,7 @@ void exec_test_case_ecdh_deterministic(void) &responder_mbed_ctx->z, &initiator_mbed_ctx->Q, &responder_mbed_ctx->d, -#if defined(CONFIG_MBEDTLS_VANILLA_BACKEND) - NULL, -#else drbg_random, -#endif NULL); stop_time_measurement(); diff --git a/zephyr/module.yml b/zephyr/module.yml index d193de47538b..dd310b987d4a 100644 --- a/zephyr/module.yml +++ b/zephyr/module.yml @@ -1,15 +1,21 @@ build: cmake: . kconfig: Kconfig.nrf + kconfig-ext: true sysbuild-cmake: sysbuild sysbuild-kconfig: sysbuild/Kconfig.sysbuild + sysbuild-kconfig-ext: true settings: soc_root: . board_root: . dts_root: . module_ext_root: . snippet_root: . - +samples: + - applications + - samples +tests: + - tests runners: # Additional runners, Zephyr will import these when discovering # subclasses of the `ZephyrBinaryRunner` class.