net: Clean up kconfigs

nordic-hani · nordicjm · commit 55a0bb7fc33e · 2025-08-26T07:04:52.000+01:00
- Some documentation was referring to kconfigs that have been removed.
- Some kconfig names has changed.
- Some kconfigs never existed in the first place.
- Some defines used CONFIG_ in the name without being a kconfig.

Signed-off-by: Håvard Vermeer &lt;havard.vermeer@nordicsemi.no&gt;
diff --git a/applications/serial_lte_modem/doc/CARRIER_AT_commands.rst b/applications/serial_lte_modem/doc/CARRIER_AT_commands.rst
@@ -448,7 +448,7 @@ The ``<cmd>`` command is a string, and can be used as follows:
   * ``all`` - Any network allowed.
   * ``0`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_GENERIC`.
   * ``1`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_VERIZON`.
-  * ``2`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_ATT`.
+  * ``2`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_BELL_CA`.
   * ``3`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_LG_UPLUS`.
   * ``4`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_T_MOBILE`.
   * ``5`` - :kconfig:option:`CONFIG_LWM2M_CARRIER_SOFTBANK`.
@@ -551,7 +551,6 @@ The ``<cmd>`` command is a string, and can be used as follows:
   * ``"N"`` - :kconfig:option:`LWM2M_CARRIER_SERVER_BINDING_N`.
 
   Additionally, an empty ``<binding>`` resets the configuration to default setting (factory configuration).
-  For details, see the :kconfig:option:`CONFIG_LWM2M_SERVER_BINDING_CHOICE` Kconfig option.
 
 * ``AT#XCARRIERCFG="is_bootstrap"[,<0|1>]``
 
diff --git a/doc/nrf/libraries/bin/lwm2m_carrier/CHANGELOG.rst b/doc/nrf/libraries/bin/lwm2m_carrier/CHANGELOG.rst
@@ -504,6 +504,8 @@ Changes
 
   * This function allows the LwM2M carrier library to disconnect gracefully and it is mandatory to use when the Subscriber ID is LG U+.
 
+* Updated the name of the ``CONFIG_LWM2M_CARRIER_IS_SERVER_BOOTSTRAP`` Kconfig option to :kconfig:option:`CONFIG_LWM2M_CARRIER_IS_BOOTSTRAP_SERVER`.
+
 liblwm2m_carrier 0.30.2
 ***********************
 
diff --git a/doc/nrf/libraries/bin/lwm2m_carrier/app_integration.rst b/doc/nrf/libraries/bin/lwm2m_carrier/app_integration.rst
@@ -155,7 +155,7 @@ Following are some of the server Kconfig options that you can configure.
 See the :ref:`enabled carriers <general_options_enabled_carriers>` under :ref:`general_options_lwm2m` for when the option is relevant.
 
 For :kconfig:option:`CONFIG_LWM2M_CARRIER_GENERIC`, no valid factory configuration has been set.
-At a minimum, a URI must be set, unless the :kconfig:option:`CONFIG_LWM2M_SERVER_BINDING_CHOICE` Kconfig option value is non-IP.
+At a minimum, a URI must be set, unless the :kconfig:option:`CONFIG_LWM2M_CARRIER_SERVER_BINDING_NONIP` Kconfig option value is set.
 
 .. note::
    Changing one or more server options will trigger a factory reset (resulting in a new bootstrap sequence).
@@ -189,15 +189,15 @@ At a minimum, a URI must be set, unless the :kconfig:option:`CONFIG_LWM2M_SERVER
     This can be different for each supported carrier.
     For generic operation (:kconfig:option:`CONFIG_LWM2M_CARRIER_GENERIC`), the default is 1 hour.
 
-* :kconfig:option:`CONFIG_LWM2M_SERVER_BINDING_CHOICE`:
+* :kconfig:option:`LWM2M_CARRIER_SERVER_BINDING_UDP`, :kconfig:option:`LWM2M_CARRIER_SERVER_BINDING_NONIP`:
 
-  * This configuration can be used to overwrite the factory default by selecting :c:macro:`LWM2M_CARRIER_SERVER_BINDING_UDP` or :c:macro:`LWM2M_CARRIER_SERVER_BINDING_NONIP`).
-  * This configuration is ignored if a bootstrap server is configured (either by our factory configuration, or by :kconfig:option:`CONFIG_LWM2M_CARRIER_IS_BOOTSTRAP_SERVER`).
+  * These configurations can be used to overwrite the factory default binding.
+    If these configurations are left empty (``=n``) the factory configuration is used.
+  * The factory default can be different for each supported carrier.
+    For generic operation (:kconfig:option:`CONFIG_LWM2M_CARRIER_GENERIC`), UDP (IP) binding is set as the default.
+  * These configurations are ignored if a bootstrap server is configured (either by the factory configuration, or by :kconfig:option:`CONFIG_LWM2M_CARRIER_IS_BOOTSTRAP_SERVER`).
   * If UDP binding is configured, a URI must also be set (:kconfig:option:`CONFIG_LWM2M_CARRIER_CUSTOM_URI`).
   * The APN (either network default, or the one set with :kconfig:option:`CONFIG_LWM2M_CARRIER_CUSTOM_APN`) must be UDP (IP) or non-IP respectively.
-  * If this configuration is left empty (``0``) the factory configuration is used.
-    This can be different for each supported carrier.
-    For generic operation (:kconfig:option:`CONFIG_LWM2M_CARRIER_GENERIC`), the default is :c:macro:`LWM2M_CARRIER_SERVER_BINDING_UDP`.
 
 .. _device_options_lwm2m:
 
diff --git a/doc/nrf/libraries/modem/lte_lc.rst b/doc/nrf/libraries/modem/lte_lc.rst
@@ -174,8 +174,8 @@ To enable power-saving features, use the following options:
 
 * :kconfig:option:`CONFIG_LTE_LC_PSM_MODULE`
 * :kconfig:option:`CONFIG_LTE_LC_EDRX_MODULE`
-* :kconfig:option:`CONFIG_LTE_LC_PSM_REQ`
-* :kconfig:option:`CONFIG_LTE_LC_EDRX_REQ`
+* :kconfig:option:`CONFIG_LTE_PSM_REQ`
+* :kconfig:option:`CONFIG_LTE_EDRX_REQ`
 
 PSM and eDRX can also be requested at run time using the :c:func:`lte_lc_psm_req` and :c:func:`lte_lc_edrx_req` function calls.
 However, calling the functions during modem initialization can lead to conflicts with the value set by the Kconfig options.
diff --git a/doc/nrf/libraries/networking/nrf_cloud.rst b/doc/nrf/libraries/networking/nrf_cloud.rst
@@ -163,7 +163,6 @@ nRF Cloud FOTA enables the following additional features and libraries:
 * :kconfig:option:`CONFIG_DFU_TARGET` enables :ref:`lib_dfu_target`
 * :kconfig:option:`CONFIG_DOWNLOADER` enables :ref:`lib_downloader`
 * :kconfig:option:`CONFIG_FOTA_DOWNLOAD_PROGRESS_EVT`
-* :kconfig:option:`CONFIG_FOTA_PROGRESS_EVT_INCREMENT`
 * :kconfig:option:`CONFIG_REBOOT`
 * :kconfig:option:`CONFIG_CJSON_LIB`
 * :kconfig:option:`CONFIG_SETTINGS`
diff --git a/include/net/rest_client.h b/include/net/rest_client.h
@@ -98,7 +98,7 @@ struct rest_client_req_context {
 	 *  for socket connection creation and data transfer meaning REST request can take
 	 *  longer than this given timeout. To disable, set the timeout duration to SYS_FOREVER_MS.
 	 *  A value of zero will result in an immediate timeout.
-	 *  Default: @kconfig{CONFIG_REST_CLIENT_REST_REQUEST_TIMEOUT}.
+	 *  Default: @kconfig{CONFIG_REST_CLIENT_REQUEST_TIMEOUT}.
 	 */
 	int32_t timeout_ms;
 
diff --git a/samples/cellular/lwm2m_client/src/events/include/location_events.h b/samples/cellular/lwm2m_client/src/events/include/location_events.h
@@ -41,6 +41,6 @@ struct pgps_data_request_event {
 };
 
 APP_EVENT_TYPE_DECLARE(pgps_data_request_event);
-#endif /* CONFIG_LWM2M_CLIEN_UTILS_LOCATION_ASSIST_PGPS */
+#endif /* CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSIST_PGPS */
 
 #endif /* LOCATION_EVENTS_H__ */
diff --git a/samples/cellular/lwm2m_client/src/ipso/ipso_colour_sensor.c b/samples/cellular/lwm2m_client/src/ipso/ipso_colour_sensor.c
@@ -30,7 +30,7 @@ LOG_MODULE_DECLARE(app_sensors, CONFIG_APP_LOG_LEVEL);
 #else
 #define COLOUR_VERSION_MINOR 0
 #define NUMBER_OF_OBJECT_FIELDS 3
-#endif /* ifdef CONFIG_LWM2M_IPSO_APP_COLOUR_VERSION_1_1 */
+#endif /* CONFIG_LWM2M_IPSO_APP_COLOUR_SENSOR_VERSION_1_1 */
 
 #define RESOURCE_INSTANCE_COUNT NUMBER_OF_OBJECT_FIELDS
 
diff --git a/samples/cellular/lwm2m_client/src/modules/Kconfig b/samples/cellular/lwm2m_client/src/modules/Kconfig
@@ -65,7 +65,7 @@ menuconfig SENSOR_MODULE_LIGHT
 	  server.
 
 
-menuconfig SENSOR_MODULE_COLOUR
+menuconfig SENSOR_MODULE_COLOR
 	bool "Enable value tracking of colour"
 	depends on APP_LIGHT_SENSOR
 	default y if BOARD_THINGY91_NRF9160_NS
diff --git a/samples/cellular/lwm2m_client/src/modules/sensor_module.c b/samples/cellular/lwm2m_client/src/modules/sensor_module.c
@@ -216,7 +216,7 @@ static int sensor_module_init(void)
 		k_work_schedule(&light_work, K_NO_WAIT);
 	}
 
-	if (IS_ENABLED(CONFIG_SENSOR_MODULE_COLOUR)) {
+	if (IS_ENABLED(CONFIG_SENSOR_MODULE_COLOR)) {
 		k_work_init_delayable(&colour_work, colour_work_cb);
 		k_work_schedule(&colour_work, K_NO_WAIT);
 	}
diff --git a/samples/cellular/lwm2m_client/src/sensors/light_sensor.c b/samples/cellular/lwm2m_client/src/sensors/light_sensor.c
@@ -65,7 +65,7 @@ static int _sensor_read(struct sensor_value measurements[])
 
 	return 0;
 }
-#endif /* if defined(CONFIG_LIGHT_SENSOR_USE_EXTERNAL) */
+#endif /* !defined(LIGHT_SENSOR_SIMULATED) */
 
 int light_sensor_read(uint32_t *light_value)
 {
diff --git a/samples/cellular/modem_shell/src/rest/rest_shell.c b/samples/cellular/modem_shell/src/rest/rest_shell.c
@@ -36,7 +36,7 @@ static const char rest_shell_cmd_usage_str[] =
 	"                       optional (1) or required (2). Default value is 2.\n"
 	"  -u, --url,           URL beyond host/domain (default: \"/index.html\")\n"
 	"  -t, --timeout,       Request timeout in seconds. Zero means timeout is disabled.\n"
-	"                       (default: CONFIG_REST_CLIENT_REST_REQUEST_TIMEOUT)\n"
+	"                       (default: CONFIG_REST_CLIENT_REQUEST_TIMEOUT)\n"
 	"  -H, --header,        Header including CRLF, for example:\n"
 	"                       -H \"Content-Type: application/json\\x0D\\x0A\"\n"
 	"  -b, --body,          Payload body, example: -b '{\"foo\":bar}'\n"
diff --git a/samples/cellular/nrf_cloud_multi_service/README.rst b/samples/cellular/nrf_cloud_multi_service/README.rst
@@ -426,7 +426,7 @@ Configuring LED status indication for third-party boards
 
 This sample assumes that the target board either has a single RGB LED with PWM support, or four discrete LEDs available.
 
-For third-party boards, you can select the RGB LED option by enabling both the :ref:`CONFIG_LED_INDICATION_PWM <CONFIG_LED_INDICATION_PWM>` and :ref:`CONFIG_LED_INDICATION_RGB <CONFIG_LED_INDICATOR_RGB>` options.
+For third-party boards, you can select the RGB LED option by enabling both the :ref:`CONFIG_LED_INDICATION_PWM <CONFIG_LED_INDICATION_PWM>` and :ref:`CONFIG_LED_INDICATOR_RGB <CONFIG_LED_INDICATOR_RGB>` options.
 In this case, the board must have a devicetree entry marked as compatible with the `Zephyr pwm-leds`_ driver.
 
 Otherwise, the four-LED option (:ref:`CONFIG_LED_INDICATION_GPIO <CONFIG_LED_INDICATION_GPIO>` and :ref:`CONFIG_LED_INDICATOR_4LED <CONFIG_LED_INDICATOR_4LED>`) is selected by default as long as there is a devicetree entry compatible with the `Zephyr gpio-leds`_ driver.
@@ -682,25 +682,25 @@ CONFIG_COAP_FOTA - Enable FOTA with CoAP
 
 If :ref:`CONFIG_COAP_FOTA <CONFIG_COAP_FOTA>` is enabled, these options additional are available:
 
-.. _CONFIG_COAP_FOTA_DL_TIMEOUT_MIN:
+.. _CONFIG_FOTA_DL_TIMEOUT_MIN:
 
-CONFIG_COAP_FOTA_DL_TIMEOUT_MIN - CoAP FOTA download timeout
+CONFIG_FOTA_DL_TIMEOUT_MIN - FOTA download timeout
     The time in minutes allotted for a FOTA download to complete.
 
-.. _CONFIG_COAP_FOTA_USE_NRF_CLOUD_SETTINGS_AREA:
+.. _CONFIG_FOTA_USE_NRF_CLOUD_SETTINGS_AREA:
 
-CONFIG_COAP_FOTA_USE_NRF_CLOUD_SETTINGS_AREA - Make FOTA compatible with other samples
+CONFIG_FOTA_USE_NRF_CLOUD_SETTINGS_AREA - Make FOTA compatible with other samples
    Use the same settings area as the nRF Cloud FOTA library.
 
-.. _CONFIG_COAP_FOTA_SETTINGS_NAME:
+.. _CONFIG_FOTA_SETTINGS_NAME:
 
-CONFIG_COAP_FOTA_SETTINGS_NAME - Settings identifier
-   Set the identifier for the CoAP FOTA storage if :kconfig:option:`CONFIG_COAP_FOTA_USE_NRF_CLOUD_SETTINGS_AREA` is not enabled.
+CONFIG_FOTA_SETTINGS_NAME - Settings identifier
+   Set the identifier for the CoAP FOTA storage if :kconfig:option:`CONFIG_FOTA_USE_NRF_CLOUD_SETTINGS_AREA` is not enabled.
 
-.. _CONFIG_COAP_FOTA_SETTINGS_KEY_PENDING_JOB:
+.. _CONFIG_FOTA_SETTINGS_KEY_PENDING_JOB:
 
-CONFIG_COAP_FOTA_SETTINGS_KEY_PENDING_JOB - Settings item key
-   Set the settings item key for pending FOTA job info if :kconfig:option:`CONFIG_COAP_FOTA_USE_NRF_CLOUD_SETTINGS_AREA` is not enabled.
+CONFIG_FOTA_SETTINGS_KEY_PENDING_JOB - Settings item key
+   Set the settings item key for pending FOTA job info if :kconfig:option:`CONFIG_FOTA_USE_NRF_CLOUD_SETTINGS_AREA` is not enabled.
 
 .. _CONFIG_COAP_FOTA_JOB_CHECK_RATE_MINUTES:
 
diff --git a/tests/lib/gcf_sms/src/main.c b/tests/lib/gcf_sms/src/main.c
@@ -172,9 +172,6 @@ ZTEST(gcf_sms, test_gcf_sms_cmss)
 {
 	int err;
 
-	/* This test require a SIM supporting SMS and mfw 1.3.2(?) or newer. */
-	Z_TEST_SKIP_IFNDEF(CONFIG_SIM_HAS_SMS_SUPPORT);
-
 	err = nrf_modem_at_cmd(response, sizeof(response), CMD_CMSS_E_1);
 	zassert_mem_equal(response, RES_CMSS_E, strlen(RES_CMSS_E), NULL);
 }
diff --git a/tests/lib/lte_lc_api/src/lte_lc_api_test.c b/tests/lib/lte_lc_api/src/lte_lc_api_test.c
@@ -292,7 +292,7 @@ void test_lte_lc_on_modem_init_success(void)
 	__mock_nrf_modem_at_printf_ExpectAndReturn("AT+CEDRXS=3", EXIT_SUCCESS);
 	/* CONFIG_LTE_RAI_REQ=n */
 	__mock_nrf_modem_at_printf_ExpectAndReturn("AT%RAI=0", EXIT_SUCCESS);
-	/* CONFIG_LTE_LC_DNS_FALLBACK */
+	/* CONFIG_LTE_LC_DNS_FALLBACK_MODULE */
 	__cmock_nrf_inet_pton_ExpectAndReturn(NRF_AF_INET, IGNORE, IGNORE, 0 /* error */);
 	__cmock_nrf_inet_pton_IgnoreArg_src();
 	__cmock_nrf_inet_pton_IgnoreArg_dst();
@@ -360,7 +360,7 @@ void test_lte_lc_on_modem_init_rai_fail(void)
 	__mock_nrf_modem_at_printf_ExpectAndReturn("AT+CEDRXS=3", EXIT_SUCCESS);
 	/* CONFIG_LTE_RAI_REQ=n */
 	__mock_nrf_modem_at_printf_ExpectAndReturn("AT%RAI=0", -NRF_EFAULT);
-	/* CONFIG_LTE_LC_DNS_FALLBACK */
+	/* CONFIG_LTE_LC_DNS_FALLBACK_MODULE */
 	/* Let's check that IPv4 works */
 	__cmock_nrf_inet_pton_ExpectAndReturn(NRF_AF_INET, IGNORE, IGNORE, 1 /* success */);
 	__cmock_nrf_inet_pton_IgnoreArg_src();

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static int sensor_module_init(void)`
`216`	`216`	`k_work_schedule(&light_work, K_NO_WAIT);`
`217`	`217`	`}`
`218`	`218`
`219`		`- if (IS_ENABLED(CONFIG_SENSOR_MODULE_COLOUR)) {`
	`219`	`+ if (IS_ENABLED(CONFIG_SENSOR_MODULE_COLOR)) {`
`220`	`220`	`k_work_init_delayable(&colour_work, colour_work_cb);`
`221`	`221`	`k_work_schedule(&colour_work, K_NO_WAIT);`
`222`	`222`	`}`