Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enable MPU
CONFIG_ARM_MPU=y

# enable GPIO
# Enable GPIO
CONFIG_GPIO=y
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enable MPU
CONFIG_ARM_MPU=y

# enable GPIO
# Enable GPIO
CONFIG_GPIO=y
2 changes: 1 addition & 1 deletion boards/nordic/thingy91/thingy91_nrf52840_defconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Enable MPU
CONFIG_ARM_MPU=y

# enable UART driver
# Enable UART driver
CONFIG_SERIAL=y

# Enable console
Expand Down
4 changes: 2 additions & 2 deletions boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions boards/nordic/thingy91x/thingy91x_nrf5340_cpunet_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 9 additions & 1 deletion doc/kconfig/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions doc/nrf/security/crypto/crypto_supported_features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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`


Expand Down
2 changes: 1 addition & 1 deletion doc/nrf/templates/application_README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion doc/nrf/templates/sample_README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion drivers/flash/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drivers/mpsl/flash_sync/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/Kconfig.nrf_sw_lpuart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/util/util_macro.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
*
Expand All @@ -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;
*
Expand Down
4 changes: 2 additions & 2 deletions lib/bin/lwm2m_carrier/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ menuconfig LWM2M_CARRIER

if LWM2M_CARRIER

menu "Enabled Carriers"
menu "Carriers"

config LWM2M_CARRIER_GENERIC
bool "Generic"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/dk_buttons_and_leds/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/edge_impulse/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

menuconfig EDGE_IMPULSE
bool "Enable Edge Impulse"
bool "Edge Impulse"
depends on CPP
depends on STD_CPP11
depends on !FP16
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/fprotect/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/hw_unique_key/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/identity_key/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions lib/lte_link_control/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.

Expand All @@ -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
Expand Down Expand Up @@ -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().
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/modem_attest_token/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading