Skip to content

Commit 279e880

Browse files
trantanennordicjm
trantanen
authored and
nordicjm
committed
samples: cellular: Remove nrf7002ek positioning overlay
The shield for nrf7002ek disables UART1 so overlays for nrf7002ek Wi-Fi positioning are not needed. Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
1 parent 5453e98 commit 279e880

File tree

13 files changed

+23
-75
lines changed

13 files changed

+23
-75
lines changed

‎applications/asset_tracker_v2/doc/location_module.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Wi-Fi positioning
6666
=================
6767

6868
Wi-Fi positioning is supported with an nRF7002 EK on the nRF91 Series DK.
69-
To enable Wi-Fi positioning and especially nRF7002 functionality, use a special DTC overlay with the compiler option ``-DEXTRA_DTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay`` and a configuration overlay ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf``.
69+
To enable Wi-Fi positioning and especially nRF7002 functionality, use the ``-DSHIELD=nrf7002ek`` and ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf`` options.
7070

7171
.. tabs::
7272

@@ -77,7 +77,7 @@ To enable Wi-Fi positioning and especially nRF7002 functionality, use a special
7777

7878
.. code-block:: console
7979
80-
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DEXTRA_DTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
80+
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
8181
8282
.. group-tab:: nRF9160 DK
8383

@@ -86,7 +86,7 @@ To enable Wi-Fi positioning and especially nRF7002 functionality, use a special
8686

8787
.. code-block:: console
8888
89-
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DEXTRA_DTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
89+
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
9090
9191
Wi-Fi positioning has the following limitations:
9292

‎applications/asset_tracker_v2/nrf91xxdk_with_nrf7002ek.overlay

-11
This file was deleted.

‎applications/asset_tracker_v2/sample.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ tests:
385385
- nrf9160dk_nrf9160_ns
386386
platform_allow: nrf9160dk_nrf9160_ns
387387
extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
388-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
389388
tags: ci_build
390389
applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk.sysbuild:
391390
build_only: true
@@ -394,15 +393,13 @@ tests:
394393
- nrf9160dk_nrf9160_ns
395394
platform_allow: nrf9160dk_nrf9160_ns
396395
extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
397-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
398396
tags: ci_build sysbuild
399397
applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
400398
build_only: true
401399
integration_platforms:
402400
- nrf9161dk_nrf9161_ns
403401
platform_allow: nrf9161dk_nrf9161_ns
404402
extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
405-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
406403
tags: ci_build
407404
applications.asset_tracker_v2.nrf7002ek_wifi-debug:
408405
build_only: true
@@ -412,7 +409,6 @@ tests:
412409
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
413410
extra_args: SHIELD=nrf7002ek
414411
EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
415-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
416412
tags: ci_build
417413
applications.asset_tracker_v2.nrf7002ek_wifi-debug.sysbuild:
418414
build_only: true
@@ -422,5 +418,4 @@ tests:
422418
platform_allow: nrf9160dk_nrf9160_ns
423419
extra_args: SHIELD=nrf7002ek
424420
EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
425-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
426421
tags: ci_build sysbuild

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

+9-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ This section provides detailed lists of changes by :ref:`application <applicatio
168168
Asset Tracker v2
169169
----------------
170170

171-
|no_changes_yet_note|
171+
* Removed nRF7002 EK DTC overlay file ``nrf91xxdk_with_nrf7002ek.overlay`` because UART1 is disabled through the shield configuration.
172172

173173
Serial LTE modem
174174
----------------
@@ -268,13 +268,19 @@ Bluetooth Mesh samples
268268
Cellular samples
269269
----------------
270270

271+
* :ref:`location_sample` sample:
272+
273+
* Removed nRF7002 EK DTC overlay file ``nrf91xxdk_with_nrf7002ek.overlay`` because UART1 is disabled through the shield configuration.
274+
271275
* :ref:`modem_shell_application` sample:
272276

273277
* Added:
274278

275279
* Printing of the last reset reason when the sample starts.
276280
* Support for printing the sample version information using the ``version`` command.
277281

282+
* Removed nRF7002 EK DTC overlay file ``nrf91xxdk_with_nrf7002ek.overlay`` because UART1 is disabled through the shield configuration.
283+
278284
* :ref:`nrf_cloud_multi_service` sample:
279285

280286
* Added a generic processing example for application-specific shadow data.
@@ -291,6 +297,8 @@ Cellular samples
291297
* The sample now explicitly uses the :c:func:`conn_mgr_all_if_connect` function to start network connectivity, instead of the :kconfig:option:`CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START` and :kconfig:option:`CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT` Kconfig options.
292298
* The sample to use the FOTA support functions in the :file:`nrf_cloud_fota_poll.c` and :file:`nrf_cloud_fota_common.c` files.
293299

300+
* Removed nRF7002 EK DTC overlay file ``nrf91xxdk_with_nrf7002ek.overlay`` because UART1 is disabled through the shield configuration.
301+
294302
* :ref:`nrf_cloud_rest_fota` sample:
295303

296304
* Added credential check before connecting to network.

‎samples/cellular/location/README.rst

+3-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ The configuration files are in the |sample path| directory.
5353

5454
The following files are available:
5555

56-
* :file:`nrf91xxdk_with_nrf7002ek.overlay` - DTC overlay for nRF7002 EK Wi-Fi chip support.
5756
* :file:`nrf7002ek-wifi-scan-only.conf` - Config overlay for nRF7002 EK Wi-Fi chip support.
5857
* :file:`esp_8266_nrf9160ns.overlay` - DTC overlay for ESP8266 Wi-Fi chip support.
5958
* :file:`overlay-esp-wifi.conf` - Config overlay for ESP8266 Wi-Fi chip support.
@@ -73,7 +72,7 @@ Building and running
7372
nRF91 Series DK with nRF7002 EK Wi-Fi support
7473
=============================================
7574

76-
To build the sample with nRF91 Series DK and nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek``, ``-DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay`` and ``-DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf`` options.
75+
To build the sample with nRF91 Series DK and nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek`` and ``-DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf`` options.
7776
For example:
7877

7978
.. tabs::
@@ -82,13 +81,13 @@ For example:
8281

8382
.. code-block:: console
8483
85-
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
84+
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
8685
8786
.. group-tab:: nRF9160 DK
8887

8988
.. code-block:: console
9089
91-
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
90+
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
9291
9392
See :ref:`cmake_options` for more instructions on how to add these options.
9493

‎samples/cellular/location/nrf91xxdk_with_nrf7002ek.overlay

-11
This file was deleted.

‎samples/cellular/location/sample.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ tests:
3232
- nrf9161dk_nrf9161_ns
3333
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
3434
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
35-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
3635
tags: ci_build
3736
sample.cellular.location.nrf7000ek_wifi:
3837
build_only: true
@@ -41,7 +40,7 @@ tests:
4140
- nrf9161dk_nrf9161_ns
4241
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
4342
extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
44-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay" CONFIG_WPA_SUPP=n
43+
CONFIG_WPA_SUPP=n
4544
tags: ci_build
4645
sample.cellular.location.nrf7001ek_wifi:
4746
build_only: true
@@ -50,5 +49,4 @@ tests:
5049
- nrf9161dk_nrf9161_ns
5150
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
5251
extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
53-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
5452
tags: ci_build

‎samples/cellular/modem_shell/README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ To program the certificates and connect to nRF Cloud, complete the following ste
10811081
nRF91 Series DK with nRF7002 EK Wi-Fi support
10821082
=============================================
10831083

1084-
To build the MoSh sample with nRF9160 DK and nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek``, ``-DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay`` and ``-DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf`` options.
1084+
To build the MoSh sample with nRF9160 DK and nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek`` and ``-DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf`` options.
10851085
For example:
10861086

10871087
.. tabs::
@@ -1090,13 +1090,13 @@ For example:
10901090

10911091
.. code-block:: console
10921092
1093-
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
1093+
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
10941094
10951095
.. group-tab:: nRF9160 DK
10961096

10971097
.. code-block:: console
10981098
1099-
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DDTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
1099+
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
11001100
11011101
See :ref:`cmake_options` for more instructions on how to add these options.
11021102

‎samples/cellular/modem_shell/nrf91xxdk_with_nrf7002ek.overlay

-11
This file was deleted.

‎samples/cellular/modem_shell/sample.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ tests:
5757
- nrf9161dk_nrf9161_ns
5858
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
5959
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
60-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
6160
tags: ci_build
6261
sample.cellular.modem_shell.nrf7000ek_wifi:
6362
build_only: true
@@ -66,7 +65,7 @@ tests:
6665
- nrf9161dk_nrf9161_ns
6766
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
6867
extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
69-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay" CONFIG_WPA_SUPP=n
68+
CONFIG_WPA_SUPP=n
7069
tags: ci_build
7170
sample.cellular.modem_shell.nrf7001ek_wifi:
7271
build_only: true
@@ -75,7 +74,6 @@ tests:
7574
- nrf9161dk_nrf9161_ns
7675
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
7776
extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
78-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
7977
tags: ci_build
8078
sample.cellular.modem_shell.nrf7002ek_wifi-debug:
8179
build_only: true
@@ -85,7 +83,6 @@ tests:
8583
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
8684
extra_args: SHIELD=nrf7002ek
8785
OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
88-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
8986
tags: ci_build
9087
sample.cellular.modem_shell.esp_wifi:
9188
build_only: true
@@ -166,7 +163,6 @@ tests:
166163
- CONFIG_NRF_CLOUD_PGPS_TRANSPORT_NONE=y
167164
extra_args: SHIELD=nrf7002ek
168165
OVERLAY_CONFIG="overlay-cloud_mqtt.conf;overlay-pgps.conf;overlay-nrf7002ek-wifi-scan-only.conf"
169-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
170166
integration_platforms:
171167
- nrf9160dk_nrf9160_ns
172168
- nrf9161dk_nrf9161_ns
@@ -244,7 +240,6 @@ tests:
244240
- CONFIG_LOCATION_METHOD_CELLULAR=n
245241
- CONFIG_LOCATION_METHOD_WIFI=y
246242
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
247-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
248243
tags: ci_build
249244
sample.cellular.modem_shell.location_wifi_cellular_no_gnss:
250245
build_only: true
@@ -257,7 +252,6 @@ tests:
257252
- CONFIG_LOCATION_METHOD_CELLULAR=y
258253
- CONFIG_LOCATION_METHOD_WIFI=y
259254
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
260-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
261255
tags: ci_build
262256
sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss:
263257
build_only: true
@@ -270,7 +264,6 @@ tests:
270264
- CONFIG_LOCATION_METHOD_CELLULAR=n
271265
- CONFIG_LOCATION_METHOD_WIFI=y
272266
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
273-
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
274267
tags: ci_build
275268
sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular:
276269
build_only: true

‎samples/cellular/nrf_cloud_multi_service/README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ To build the sample to use CoAP instead of MQTT, use the ``-DOVERLAY_CONFIG=over
955955
Building with nRF7002 EK Wi-Fi scanning support (for nRF91 Series DK)
956956
=====================================================================
957957

958-
To build the sample with nRF7002 EK Wi-Fi scanning support, use the ``-DSHIELD=nrf7002ek``, ``-DEXTRA_DTC_OVERLAY_FILE=nrf91xxdk_with_nrf7002ek.overlay`` and ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf`` options.
958+
To build the sample with nRF7002 EK Wi-Fi scanning support, use the ``-DSHIELD=nrf7002ek`` and ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf`` options.
959959

960960
This enables the Wi-Fi location tracking method automatically.
961961

@@ -965,13 +965,13 @@ This enables the Wi-Fi location tracking method automatically.
965965

966966
.. code-block:: console
967967
968-
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DEXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay" -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
968+
west build -p -b nrf9161dk_nrf9161_ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
969969
970970
.. group-tab:: nRF9160 DK
971971

972972
.. code-block:: console
973973
974-
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DEXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay" -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
974+
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
975975
976976
See also :ref:`the paragraphs on the Wi-Fi location tracking method <nrf_cloud_multi_service_wifi_location_tracking>`.
977977

‎samples/cellular/nrf_cloud_multi_service/nrf91xxdk_with_nrf7002ek.overlay

-11
This file was deleted.

‎samples/cellular/nrf_cloud_multi_service/sample.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ tests:
4747
- nrf9161dk_nrf9161_ns
4848
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
4949
extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
50-
EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
5150
tags: ci_build
5251
sample.cellular.nrf7002ek_wifi.conn:
5352
build_only: true

0 commit comments

Comments
 (0)