applications: asset_tracker_v2: integrate with P-GPS partition

When using P-GPS partition in flash, no need to refer to
PM_MCUBOOT_SECONDARY_ADDRESS or SIZE.

The P-GPS partition will be enabled if CONFIG_BUILD_S1_VARIANT
is enabled in order to prevent BOOT FOTA conflicts.

Disable CONFIG_SECURE_BOOT and CONFIG_BUILD_S1_VARIANT
when building for the thingy91_nrf9160 board, as its statically-
defined partitions do not have enough extra space for MCUboot
FOTA.

Fix A-GPS when combined with P-GPS to not request both ephemerides
and almanac via A-GPS.

Signed-off-by: Pete Skeggs <[email protected]>

Author: plskeggs

applications/asset_tracker_v2/boards/thingy91_nrf9160_ns.conf

@@ -27,3 +27,7 @@ CONFIG_BME680=y
 CONFIG_PWM=y
 CONFIG_LED_PWM=y
 CONFIG_CAF_LEDS_PWM=y
+
+# Disable MCUboot DFU -- incompatible with static partitions
+CONFIG_SECURE_BOOT=n
+CONFIG_BUILD_S1_VARIANT=n

applications/asset_tracker_v2/prj.conf

@@ -75,6 +75,8 @@ CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_MCUBOOT_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
+CONFIG_SECURE_BOOT=y
+CONFIG_BUILD_S1_VARIANT=y
 
 # Watchdog
 CONFIG_WATCHDOG_APPLICATION=y

applications/asset_tracker_v2/src/modules/cloud_module.c

@@ -16,7 +16,6 @@
 #endif
 #if defined(CONFIG_NRF_CLOUD_PGPS)
 #include <net/nrf_cloud_pgps.h>
-#include <pm_config.h>
 #endif
 
 #include "cloud_wrapper.h"
@@ -906,8 +905,9 @@ static void on_all_states(struct cloud_msg_data *msg)
 	if (IS_EVENT(msg, data, DATA_EVT_DATE_TIME_OBTAINED)) {
 		struct nrf_cloud_pgps_init_param param = {
 			.event_handler = pgps_handler,
-			.storage_base = PM_MCUBOOT_SECONDARY_ADDRESS,
-			.storage_size = PM_MCUBOOT_SECONDARY_SIZE
+			/* storage is defined by CONFIG_NRF_CLOUD_PGPS_STORAGE */
+			.storage_base = 0u,
+			.storage_size = 0u
 		};
 
 		int err = nrf_cloud_pgps_init(&param);

applications/asset_tracker_v2/src/modules/data_module.c

@@ -15,7 +15,6 @@
 
 #if defined(CONFIG_NRF_CLOUD_PGPS)
 #include <net/nrf_cloud_pgps.h>
-#include <pm_config.h>
 #endif
 
 #include "cloud/cloud_codec/cloud_codec.h"
@@ -695,8 +694,11 @@ static int agps_request_encode(struct nrf_modem_gnss_agps_data_frame *incoming_r
 	}
 
 	if (incoming_request == NULL) {
-		cloud_agps_request.request.sv_mask_ephe = 0xFFFFFFFF,
-		cloud_agps_request.request.sv_mask_alm = 0xFFFFFFFF,
+		const uint32_t mask = IS_ENABLED(CONFIG_NRF_CLOUD_PGPS) ? 0u : 0xFFFFFFFFu;
+
+		LOG_DBG("Requesting all A-GPS elements");
+		cloud_agps_request.request.sv_mask_ephe = mask,
+		cloud_agps_request.request.sv_mask_alm = mask,
 		cloud_agps_request.request.data_flags =
 					NRF_MODEM_GNSS_AGPS_GPS_UTC_REQUEST |
 					NRF_MODEM_GNSS_AGPS_KLOBUCHAR_REQUEST |
@@ -996,13 +998,11 @@ static void agps_request_handle(struct nrf_modem_gnss_agps_data_frame *incoming_
 #if defined(CONFIG_NRF_CLOUD_AGPS)
 	struct nrf_modem_gnss_agps_data_frame request;
 
-	if (IS_ENABLED(CONFIG_NRF_CLOUD_PGPS) && incoming_request != NULL) {
-		request.sv_mask_ephe = 0;
-		request.sv_mask_alm = 0;
-		request.data_flags = incoming_request->data_flags;
-	} else if (incoming_request != NULL) {
-		request.sv_mask_ephe = incoming_request->sv_mask_ephe;
-		request.sv_mask_alm = incoming_request->sv_mask_alm;
+	if (incoming_request != NULL) {
+		request.sv_mask_ephe = IS_ENABLED(CONFIG_NRF_CLOUD_PGPS) ?
+				       0u : incoming_request->sv_mask_ephe;
+		request.sv_mask_alm = IS_ENABLED(CONFIG_NRF_CLOUD_PGPS) ?
+				       0u : incoming_request->sv_mask_alm;
 		request.data_flags = incoming_request->data_flags;
 	}