modules: Make modules optional

Make modules optional.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/CMakeLists.txt

@@ -17,13 +17,13 @@ target_sources(app PRIVATE src/main.c)
 
 # Include mandatory module source folders
 add_subdirectory(src/modules/network)
-add_subdirectory(src/modules/cloud)
-add_subdirectory(src/modules/location)
-add_subdirectory(src/modules/fota)
 add_subdirectory(src/modules/button)
 add_subdirectory(src/cbor)
 
 # Optional modules
 add_subdirectory_ifdef(CONFIG_APP_POWER src/modules/power)
 add_subdirectory_ifdef(CONFIG_APP_ENVIRONMENTAL src/modules/environmental)
 add_subdirectory_ifdef(CONFIG_APP_LED src/modules/led)
+add_subdirectory_ifdef(CONFIG_APP_LOCATION src/modules/location)
+add_subdirectory_ifdef(CONFIG_APP_CLOUD src/modules/cloud)
+add_subdirectory_ifdef(CONFIG_APP_FOTA src/modules/fota)

app/src/modules/cloud/Kconfig.cloud

@@ -4,8 +4,11 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "Cloud module"
-	depends on NRF_CLOUD_COAP
+menuconfig APP_CLOUD
+	bool "Cloud module"
+	default y if NRF_CLOUD_COAP
+
+if APP_CLOUD
 
 config APP_CLOUD_SHELL
 	bool "Enable cloud shell"
@@ -112,4 +115,4 @@ module = APP_CLOUD
 module-str = Cloud
 source "subsys/logging/Kconfig.template.log_config"
 
-endmenu # Cloud
+endif # APP_CLOUD

app/src/modules/fota/Kconfig.fota

@@ -6,8 +6,9 @@
 
 menuconfig APP_FOTA
 	bool "FOTA"
-	select FOTA
-	default y if !BOARD_NATIVE_POSIX
+	default y if (!BOARD_NATIVE_POSIX && NRF_CLOUD_FOTA_POLL)
+
+if APP_FOTA
 
 config APP_FOTA_THREAD_STACK_SIZE
 	int "Thread stack size"
@@ -33,8 +34,6 @@ config APP_FOTA_MSG_PROCESSING_TIMEOUT_SECONDS
 	  Maximum time allowed for processing a single message in the module's state machine.
 	  The value must be smaller than CONFIG_APP_FOTA_WATCHDOG_TIMEOUT_SECONDS.
 
-if APP_FOTA
-
 module = APP_FOTA
 module-str = FOTA
 source "subsys/logging/Kconfig.template.log_config"

app/src/modules/location/Kconfig.location

@@ -3,9 +3,12 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "Location"
-	depends on LOCATION
-	depends on LOCATION_DATA_DETAILS
+menuconfig APP_LOCATION
+	bool "Location"
+	default y if LOCATION
+	select LOCATION_DATA_DETAILS
+
+if APP_LOCATION
 
 config APP_LOCATION_THREAD_STACK_SIZE
 	int "Thread stack size"
@@ -35,4 +38,4 @@ module = APP_LOCATION
 module-str = Location
 source "subsys/logging/Kconfig.template.log_config"
 
-endmenu # Network
+endif # APP_LOCATION