From 208deb6af638d484aef8355f7f77037939001009 Mon Sep 17 00:00:00 2001 From: Emanuele Di Santo Date: Wed, 18 Sep 2024 09:56:22 +0200 Subject: [PATCH 1/2] treewide: do not select NRF_MODEM_LIB libmodem is enabled automatically for all nRF9 projects. Using `select` to express a dependency is bad practice, and should be avoided in favour of `depends on`. Signed-off-by: Emanuele Di Santo --- lib/modem_info/Kconfig | 2 +- lib/modem_jwt/Kconfig | 2 +- subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/modem_info/Kconfig b/lib/modem_info/Kconfig index c5585698188a..18ebbb0ac4b3 100644 --- a/lib/modem_info/Kconfig +++ b/lib/modem_info/Kconfig @@ -6,7 +6,7 @@ menuconfig MODEM_INFO bool "nRF91 modem information library" - select NRF_MODEM_LIB + depends on NRF_MODEM_LIB select AT_PARSER select AT_MONITOR diff --git a/lib/modem_jwt/Kconfig b/lib/modem_jwt/Kconfig index c68f556f5f15..0a90c6f72930 100644 --- a/lib/modem_jwt/Kconfig +++ b/lib/modem_jwt/Kconfig @@ -6,7 +6,7 @@ menuconfig MODEM_JWT bool "Modem JWT Library" - select NRF_MODEM_LIB + depends on NRF_MODEM_LIB select BASE64 help Functionality requires modem firmware version 1.3 or greater. diff --git a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota index 88c1e9da3979..5893278c4d05 100644 --- a/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota +++ b/subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_fota @@ -91,7 +91,7 @@ endif # NRF_CLOUD_REST menuconfig NRF_CLOUD_FOTA_FULL_MODEM_UPDATE bool "Enable full modem FOTA updates" - select NRF_MODEM_LIB + depends on NRF_MODEM_LIB select ZCBOR select DFU_TARGET select DFU_TARGET_FULL_MODEM From a79912921dec0f192c675a9bed1c598712f561c3 Mon Sep 17 00:00:00 2001 From: Emanuele Di Santo Date: Wed, 18 Sep 2024 10:39:29 +0200 Subject: [PATCH 2/2] net: lib: nrf_provisioning: do not imply NRF_MODEM_LIB Do not imply NRF_MODEM_LIB, instead depend on it. It is enabled by default in all nRF9 projects. Signed-off-by: Emanuele Di Santo --- subsys/net/lib/nrf_provisioning/Kconfig | 2 +- subsys/net/lib/nrf_provisioning/Kconfig.nrf_provisioning_codec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subsys/net/lib/nrf_provisioning/Kconfig b/subsys/net/lib/nrf_provisioning/Kconfig index f80d512365f2..584da3e74037 100644 --- a/subsys/net/lib/nrf_provisioning/Kconfig +++ b/subsys/net/lib/nrf_provisioning/Kconfig @@ -7,7 +7,7 @@ menuconfig NRF_PROVISIONING bool "nRF Provisioning" select EXPERIMENTAL - imply NRF_MODEM_LIB + depends on NRF_MODEM_LIB depends on SETTINGS imply FCB diff --git a/subsys/net/lib/nrf_provisioning/Kconfig.nrf_provisioning_codec b/subsys/net/lib/nrf_provisioning/Kconfig.nrf_provisioning_codec index bdfeeee2e218..38db4e465f8a 100644 --- a/subsys/net/lib/nrf_provisioning/Kconfig.nrf_provisioning_codec +++ b/subsys/net/lib/nrf_provisioning/Kconfig.nrf_provisioning_codec @@ -6,7 +6,7 @@ menuconfig NRF_PROVISIONING_CODEC bool "nRF Provisioning codec" select EXPERIMENTAL - imply NRF_MODEM_LIB + depends on NRF_MODEM_LIB if NRF_PROVISIONING_CODEC