fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/04716d1d151ec67ff8ac6ef217cd3483c0fc1abe/applications/asset_tracker_v2

boards/nrf9160dk_nrf9160_ns_0_14_0.overlay

@@ -9,6 +9,10 @@
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
+
+	aliases {
+		ext-flash = &mx25r64;
+	};
 };
 
 &mx25r64 {

boards/nrf9161dk_nrf9161_ns.overlay

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
 /	{
 	/delete-node/ leds;
 
@@ -42,12 +48,16 @@
 		};
 	};
 
-	/* Configure partition manager to use gd25lb256 as the external flash */
+	/* Configure partition manager to use gd25wb256 as the external flash */
 	chosen {
-		nordic,pm-ext-flash = &gd25lb256;
+		nordic,pm-ext-flash = &gd25wb256;
+	};
+
+	aliases {
+		ext-flash = &gd25wb256;
 	};
 };
 
-&gd25lb256 {
+&gd25wb256 {
 	status = "okay";
 };

boards/nrf9161dk_nrf9161_ns_0_7_0.overlay

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/delete-node/ &gd25wb256;
+
+ / {
+	chosen {
+		nordic,pm-ext-flash = &gd25lb256;
+	};
+
+	aliases {
+		ext-flash = &gd25lb256;
+	};
+};
+
+&gd25lb256 {
+	status = "okay";
+};

child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-&gd25lb256 {
+&gd25wb256 {
 	status = "okay";
 };
 
 / {
-	/* Configure partition manager to use gd25lb256 as the external flash */
+	/* Configure partition manager to use gd25wb256 as the external flash */
 	chosen {
-		nordic,pm-ext-flash = &gd25lb256;
+		nordic,pm-ext-flash = &gd25wb256;
 	};
 };

child_image/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/delete-node/ &gd25wb256;
+
+ / {
+	/* Configure partition manager to use gd25lb256 as the external flash */
+	chosen {
+		nordic,pm-ext-flash = &gd25lb256;
+	};
+};
+
+&gd25lb256 {
+	status = "okay";
+};

doc/app_behavior.rst

@@ -123,17 +123,17 @@ User interface
 The application supports basic UI elements to visualize its operating state and to notify the cloud using button presses.
 This functionality is implemented in the :ref:`UI module <asset_tracker_v2_ui_module>` and the supported LED patterns are documented in the :ref:`UI module LED indication <led_indication>` section.
 
-A-GPS and P-GPS
-***************
+A-GNSS and P-GPS
+****************
 
-The application supports processing of incoming A-GPS and P-GPS data to reduce the GNSS Time-To-First-Fix (`TTFF`_).
-Requesting and processing of A-GPS data is a default feature of the application.
-See :ref:`nRF Cloud A-GPS and P-GPS <nrfcloud_agps_pgps>` for further details.
+The application supports processing of incoming A-GNSS and P-GPS data to reduce the GNSS Time-To-First-Fix (`TTFF`_).
+Requesting and processing of A-GNSS data is a default feature of the application.
+See :ref:`nRF Cloud A-GNSS and P-GPS <nrfcloud_agnss_pgps>` for further details.
 To enable support for P-GPS, add the parameter ``-DEXTRA_CONF_FILE=overlay-pgps.conf`` to your build command.
 
 .. note::
    Enabling support for P-GPS creates a new flash partition in the image for storing P-GPS data.
    To ensure that the resulting binary can be deployed using FOTA, you must make sure that the new partition layout is compatible with layout of the old image.
    See :ref:`static partitioning <ug_pm_static_providing>` for more details.
 
-   |gps_tradeoffs|
+   |gnss_tradeoffs|

doc/asset_tracker_v2_description.rst

@@ -230,7 +230,7 @@ This application uses the following |NCS| libraries and drivers:
 * :ref:`lib_lwm2m_location_assistance`
 * :ref:`lib_nrf_cloud`
 * :ref:`lib_nrf_cloud_fota`
-* :ref:`lib_nrf_cloud_agps`
+* :ref:`lib_nrf_cloud_agnss`
 * :ref:`lib_nrf_cloud_pgps`
 * :ref:`lib_date_time`
 * :ref:`lte_lc_readme`

doc/cloud_module.rst

@@ -35,7 +35,7 @@ See :ref:`Cloud wrapper API <api_cloud_wrapper>` for more information on how eac
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`FOTA <nrf9160_fota>` |
 |                                                                                    +-------------------------------+
-|                                                                                    |    :ref:`lib_nrf_cloud_agps`  |
+|                                                                                    |    :ref:`lib_nrf_cloud_agnss` |
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`lib_nrf_cloud_pgps`  |
 +------------------------------------------------------------------------------------+-------------------------------+
@@ -47,7 +47,7 @@ See :ref:`Cloud wrapper API <api_cloud_wrapper>` for more information on how eac
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`FOTA <nrf9160_fota>` |
 |                                                                                    +-------------------------------+
-|                                                                                    |    :ref:`lib_nrf_cloud_agps`  |
+|                                                                                    |    :ref:`lib_nrf_cloud_agnss` |
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`lib_nrf_cloud_pgps`  |
 +------------------------------------------------------------------------------------+-------------------------------+
@@ -59,7 +59,7 @@ See :ref:`Cloud wrapper API <api_cloud_wrapper>` for more information on how eac
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`FOTA <nrf9160_fota>` |
 |                                                                                    +-------------------------------+
-|                                                                                    |    :ref:`lib_nrf_cloud_agps`  |
+|                                                                                    |    :ref:`lib_nrf_cloud_agnss` |
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`lib_nrf_cloud_pgps`  |
 +------------------------------------------------------------------------------------+-------------------------------+
@@ -73,18 +73,18 @@ See :ref:`Cloud wrapper API <api_cloud_wrapper>` for more information on how eac
 |                                                                                    +-------------------------------+
 |                                                                                    |    :ref:`FOTA <nrf9160_fota>` |
 |                                                                                    +-------------------------------+
-|                                                                                    |    :ref:`lib_nrf_cloud_agps`  |
+|                                                                                    |    :ref:`lib_nrf_cloud_agnss` |
 +------------------------------------------------------------------------------------+-------------------------------+
 
-.. _nrfcloud_agps_pgps:
+.. _nrfcloud_agnss_pgps:
 
-nRF Cloud A-GPS and P-GPS
-=========================
+nRF Cloud A-GNSS and P-GPS
+==========================
 
-When the cloud module is configured to communicate with `AWS IoT Core`_, `Azure IoT Hub`_, or an `LwM2M`_ server, it supports processing of received A-GPS and P-GPS data using the :ref:`lib_nrf_cloud_agps` and :ref:`lib_nrf_cloud_pgps` libraries.
-This enables the cloud service to fetch A-GPS and P-GPS data directly from `nRF Cloud`_ using REST calls and relay this data to an nRF91 Series SiP using the pre-established cloud connection.
+When the cloud module is configured to communicate with `AWS IoT Core`_, `Azure IoT Hub`_, or an `LwM2M`_ server, it supports processing of received A-GNSS and P-GPS data using the :ref:`lib_nrf_cloud_agnss` and :ref:`lib_nrf_cloud_pgps` libraries.
+This enables the cloud service to fetch A-GNSS and P-GPS data directly from `nRF Cloud`_ using REST calls and relay this data to an nRF91 Series SiP using the pre-established cloud connection.
 By reusing the pre-established connection, the application saves overhead related to maintaining multiple connections at the same time.
-When configuring the application to communicate with nRF Cloud, A-GPS and P-GPS data are received directly from the service, and not by proxy.
+When configuring the application to communicate with nRF Cloud, A-GNSS and P-GPS data are received directly from the service, and not by proxy.
 For more information, see `nRF Cloud Location Services <nRF Cloud Location Services documentation_>`_.
 
 FOTA
@@ -247,7 +247,7 @@ Dependencies
 This module uses the following |NCS| libraries and drivers:
 
 * :ref:`api_cloud_wrapper`
-* :ref:`lib_nrf_cloud_agps`
+* :ref:`lib_nrf_cloud_agnss`
 * :ref:`lib_nrf_cloud_pgps`
 
 API documentation

doc/cloud_wrapper.rst

@@ -118,7 +118,7 @@ Device-to-cloud (D2C)
 +------------------------------+--------------------------------------------------------+
 |              Data            |            Topic                                       |
 +==============================+========================================================+
-| A-GPS requests               | ``<imei>/agps/get``                                    |
+| A-GNSS requests              | ``<imei>/agps/get``                                    |
 +------------------------------+--------------------------------------------------------+
 | P-GPS requests               | ``<imei>/pgps/get``                                    |
 +------------------------------+--------------------------------------------------------+
@@ -139,7 +139,7 @@ Cloud-to-device (C2D)
 +------------------------------+--------------------------------------------------------+
 |              Data            |            Topic                                       |
 +==============================+========================================================+
-| A-GPS response               | ``<imei>/agps``                                        |
+| A-GNSS response              | ``<imei>/agps``                                        |
 +------------------------------+--------------------------------------------------------+
 | P-GPS response               | ``<imei>/pgps``                                        |
 +------------------------------+--------------------------------------------------------+
@@ -162,7 +162,7 @@ Device-to-cloud (D2C)
 +------------------------------+---------------------------------------------+--------------+
 |               Data           |             Topic                           | Property bag |
 +==============================+=============================================+==============+
-| A-GPS requests               | ``devices/<imei>/messages/events/``         | ``agps=get`` |
+| A-GNSS requests              | ``devices/<imei>/messages/events/``         | ``agps=get`` |
 +------------------------------+---------------------------------------------+--------------+
 | P-GPS requests               | ``devices/<imei>/messages/events/``         | ``pgps=get`` |
 +------------------------------+---------------------------------------------+--------------+
@@ -183,7 +183,7 @@ Cloud-to-device (C2D)
 +------------------------------+------------------------------------------+----------------+
 |               Data           |             Topic                        | Property bag   |
 +==============================+==========================================+================+
-| A-GPS response               | ``devices/<imei>/messages/devicebound/`` | ``agps=result``|
+| A-GNSS response              | ``devices/<imei>/messages/devicebound/`` | ``agps=result``|
 +------------------------------+------------------------------------------+----------------+
 | P-GPS response               | ``devices/<imei>/messages/devicebound/`` | ``pgps=result``|
 +------------------------------+------------------------------------------+----------------+
@@ -201,7 +201,7 @@ Device-to-cloud (D2C)
 +------------------------------+----------------------------------------------------+
 |              Data            |            AWS IoT topic                           |
 +==============================+====================================================+
-| A-GPS requests               | ``<topic_prefix>/<imei>/d2c``                      |
+| A-GNSS requests              | ``<topic_prefix>/<imei>/d2c``                      |
 +------------------------------+----------------------------------------------------+
 | P-GPS requests               | ``<topic_prefix>/<imei>/d2c``                      |
 +------------------------------+----------------------------------------------------+
@@ -224,7 +224,7 @@ Cloud-to-device (C2D)
 +------------------------------+----------------------------------------------------+
 |              Data            |            AWS IoT topic                           |
 +==============================+====================================================+
-| A-GPS response               | ``<topic_prefix>/<imei>/c2d``                      |
+| A-GNSS response              | ``<topic_prefix>/<imei>/c2d``                      |
 +------------------------------+----------------------------------------------------+
 | P-GPS response               | ``<topic_prefix>/<imei>/c2d``                      |
 +------------------------------+----------------------------------------------------+
@@ -265,7 +265,7 @@ For more information on objects used in LwM2M, refer to the `OMA LwM2M Object an
 +------------------------------------------------------------------+----------------------+
 | Ground Fix (Cellular and Wi-Fi location)                         | 33626                |
 +------------------------------------------------------------------+----------------------+
-| GNSS Assistance (A-GPS / P-GPS)                                  | 33625                |
+| GNSS Assistance (A-GNSS / P-GPS)                                 | 33625                |
 +------------------------------------------------------------------+----------------------+
 | Configuration (see :ref:`object_xml_config`)                     | 50009                |
 +------------------------------------------------------------------+----------------------+

doc/data_module.rst

@@ -174,7 +174,7 @@ Dependencies
 This module uses the following |NCS| libraries and drivers:
 
 * :ref:`app_event_manager`
-* :ref:`lib_nrf_cloud_agps`
+* :ref:`lib_nrf_cloud_agnss`
 * :ref:`lib_nrf_cloud_pgps`
 * :ref:`settings_api`
 

doc/location_module.rst

@@ -44,7 +44,7 @@ The module sends the following events based on the outcome of the location reque
 * :c:enum:`LOCATION_MODULE_EVT_CLOUD_LOCATION_DATA_READY`: Neighbor cell measurements or Wi-Fi access points (or both) have been obtained
 * :c:enum:`LOCATION_MODULE_EVT_DATA_NOT_READY`: Location request failed
 * :c:enum:`LOCATION_MODULE_EVT_TIMEOUT`: Timeout occurred
-* :c:enum:`LOCATION_MODULE_EVT_AGPS_NEEDED`: A-GPS request should be sent to cloud
+* :c:enum:`LOCATION_MODULE_EVT_AGNSS_NEEDED`: A-GNSS request should be sent to cloud
 * :c:enum:`LOCATION_MODULE_EVT_PGPS_NEEDED`: P-GPS request should be sent to cloud
 
 GNSS LNA configuration
@@ -59,8 +59,8 @@ GPS assistance data
 ===================
 
 The location module receives requests for GPS assistance data from the :ref:`lib_location` library.
-When the module receives an A-GPS request, it distributes it to the other modules as a :c:enum:`LOCATION_MODULE_EVT_AGPS_NEEDED` event that contains information about the type of assistance data needed.
-Providing the requested A-GPS data typically reduces significantly the time it takes to acquire a GNSS fix.
+When the module receives an A-GNSS request, it distributes it to the other modules as a :c:enum:`LOCATION_MODULE_EVT_AGNSS_NEEDED` event that contains information about the type of assistance data needed.
+Providing the requested A-GNSS data typically reduces significantly the time it takes to acquire a GNSS fix.
 
 Wi-Fi positioning
 =================

overlay-lwm2m.conf

@@ -89,7 +89,7 @@ CONFIG_LWM2M_CLIENT_UTILS_GROUND_FIX_OBJ_SUPPORT=y
 
 # Object used for assisted GNSS data. P-GPS is not enabled by default but will be enabled if
 # overlay-pgps.conf is added to the build command. This is handled in Kconfig.lwm2m_integration.
-# P-GPS and A-GPS are currently mutually exclusive features.
+# P-GPS and A-GNSS are currently mutually exclusive features.
 CONFIG_LWM2M_CLIENT_UTILS_GNSS_ASSIST_OBJ_SUPPORT=y
-CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSIST_AGPS=y
+CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSIST_AGNSS=y
 CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSIST_CELL=y

sample.yaml

@@ -19,14 +19,14 @@ tests:
       - thingy91_nrf9160_ns
     extra_args: EXTRA_CONF_FILE=overlay-pgps.conf
     tags: ci_build
-  applications.asset_tracker_v2.nrf_cloud-no-agps:
+  applications.asset_tracker_v2.nrf_cloud-no-agnss:
     build_only: true
     build_on_all: true
     platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - thingy91_nrf9160_ns
-    extra_args: CONFIG_NRF_CLOUD_AGPS=n
+    extra_args: CONFIG_NRF_CLOUD_AGNSS=n
     tags: ci_build
   applications.asset_tracker_v2.aws:
     build_only: true
@@ -133,7 +133,6 @@ tests:
     integration_platforms:
       - nrf9161dk_nrf9161_ns
     extra_args: EXTRA_CONF_FILE=overlay-carrier.conf
-                EXTRA_DTC_OVERLAY_FILE=nrf9161dk_with_ext_flash.overlay
     tags: ci_build
   applications.asset_tracker_v2.lwm2m.low-power:
     build_only: true
@@ -194,15 +193,15 @@ tests:
       - nrf9160dk_nrf9160_ns
     platform_allow: nrf9160dk_nrf9160_ns
     extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
-                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay;nrf9160dk_with_ext_flash.overlay"
+                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
     tags: ci_build
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
     build_only: true
     integration_platforms:
       - nrf9161dk_nrf9161_ns
     platform_allow: nrf9161dk_nrf9161_ns
     extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
-                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay;nrf9161dk_with_ext_flash.overlay"
+                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
     tags: ci_build
   applications.asset_tracker_v2.nrf7002ek_wifi-debug:
     build_only: true