kconfig: don't 'select' ZCBOR

When an option depends on another option being set, its definition should use 'depends on' - not 'select'. Using 'select' introduces a two way dependency which makes it impossible to express proper kconfig dependencies in some cases. See 'select pitfalls' chapter in zephyr documentation for details. Ref: NCSDK-27818 Signed-off-by: Håkon Amundsen <[email protected]>
nrfconnect · Jun 6, 2024 · c6b7c7f · c6b7c7f
1 parent f1db33f
commit c6b7c7f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/applications/nrf_desktop/src/modules/Kconfig.dfu_mcumgr b/applications/nrf_desktop/src/modules/Kconfig.dfu_mcumgr
@@ -15,7 +15,7 @@ menuconfig DESKTOP_DFU_MCUMGR_ENABLE
 	select NET_BUF
 	select FLASH
 	select FLASH_MAP
-	select ZCBOR
+	depends on ZCBOR
 	help
 	  This option enables an alternative method of performing DFU using the
 	  MCUmgr module.

diff --git a/lib/modem_attest_token/Kconfig b/lib/modem_attest_token/Kconfig
@@ -16,7 +16,7 @@ if MODEM_ATTEST_TOKEN
 
 config MODEM_ATTEST_TOKEN_PARSING
 	bool "Enable parsing of the attestation token"
-	select ZCBOR
+	depends on ZCBOR
 	select BASE64
 	default y
 

diff --git a/samples/common/mcumgr_bt_ota_dfu/Kconfig b/samples/common/mcumgr_bt_ota_dfu/Kconfig
@@ -10,7 +10,6 @@ config NCS_SAMPLE_MCUMGR_BT_OTA_DFU
 	bool "MCUmgr OTA DFU over Bluetooth"
 	select MCUMGR
 	select NET_BUF
-	select ZCBOR
 	select CRC
 	select MCUMGR_TRANSPORT_BT
 	imply MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL
@@ -26,6 +25,7 @@ config NCS_SAMPLE_MCUMGR_BT_OTA_DFU
 	imply NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP
 	depends on BT_PERIPHERAL
 	depends on BOOTLOADER_MCUBOOT
+	depends on ZCBOR
 	help
 	  Enable this option to include MCUmgr in the build which will enable
 	  the Bluetooth transport and image management group, which allows

diff --git a/subsys/dfu/dfu_multi_image/Kconfig b/subsys/dfu/dfu_multi_image/Kconfig
@@ -6,7 +6,7 @@
 
 menuconfig DFU_MULTI_IMAGE
 	bool "Device Firmware Upgrade Multi Image API"
-	select ZCBOR
+	depends on ZCBOR
 
 if DFU_MULTI_IMAGE
 

diff --git a/subsys/dfu/dfu_target/Kconfig b/subsys/dfu/dfu_target/Kconfig
@@ -117,10 +117,10 @@ config DFU_TARGET_SUIT
 	bool "SUIT DFU target support"
 	default y
 	depends on SUIT
+	depends on ZCBOR
+	depends on ZCBOR_CANONICAL
 	imply MPU_ALLOW_FLASH_WRITE
 	select SUIT_UTILS
-	select ZCBOR
-	select ZCBOR_CANONICAL
 	select DFU_TARGET_STREAM
 	help
 	  Enable support for updates using DFU target based on SUIT

diff --git a/subsys/net/lib/mcumgr_smp_client/Kconfig b/subsys/net/lib/mcumgr_smp_client/Kconfig
@@ -12,14 +12,14 @@ menuconfig NRF_MCUMGR_SMP_CLIENT
 	select DOWNLOAD_CLIENT
 	select FOTA_DOWNLOAD
 	select NET_BUF
-	select ZCBOR
 	select CRC
 	select MCUMGR
 	select SMP_CLIENT
 	select MCUMGR_GRP_IMG_CLIENT
 	select MCUMGR_GRP_OS_CLIENT
 	select MCUMGR_GRP_OS_CLIENT_ECHO
 	select MCUMGR_GRP_OS_CLIENT_RESET
+	depends on ZCBOR
 
 if NRF_MCUMGR_SMP_CLIENT
 

diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap
@@ -5,8 +5,8 @@
 
 menuconfig NRF_CLOUD_COAP
 	bool "nRF Cloud COAP"
+	depends on ZCBOR
 	select CJSON_LIB
-	select ZCBOR
 	select COAP
 	select COAP_EXTENDED_OPTIONS_LEN
 	select COAP_CLIENT

diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota
@@ -90,8 +90,8 @@ endif # NRF_CLOUD_REST
 
 menuconfig NRF_CLOUD_FOTA_FULL_MODEM_UPDATE
 	bool "Enable full modem FOTA updates"
+	depends on ZCBOR
 	select NRF_MODEM_LIB
-	select ZCBOR
 	select DFU_TARGET
 	select DFU_TARGET_FULL_MODEM
 	select DFU_TARGET_STREAM

diff --git a/subsys/nrf_rpc/Kconfig b/subsys/nrf_rpc/Kconfig
@@ -47,8 +47,8 @@ endif # NRF_RPC_IPC_SERVICE
 
 config NRF_RPC_CBOR
 	bool
-	select ZCBOR
-	select ZCBOR_STOP_ON_ERROR
+	depends on ZCBOR
+	depends on ZCBOR_STOP_ON_ERROR
 
 # End of Zephyr port dependencies selection
 

diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig
@@ -14,7 +14,7 @@ config SDFW_SERVICES_ENABLED
 	bool
 	default y
 	depends on SSF_CLIENT
-	imply ZCBOR
+	depends on ZCBOR
 	help
 	  Enable SDFW Service Framework (SSF)
 

diff --git a/west.yml b/west.yml
@@ -148,7 +148,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 35461fb622fc8670d01fc02582446f671beaed7f
+      revision: pull/1372/head
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m