Skip to content

Commit

Permalink
samples: https_client: Rename nRF91 specific overlay files
Browse files Browse the repository at this point in the history
The pdn and tfm overlay files are only applicable for the nRF91 series.
They are now remamed to reflect the same.
Readme updated.
Additional build configuration added to ensure that the PDN overlay gets
built by CI.

Fixes CIA-1162.

Signed-off-by: Balaji Srinivasan <[email protected]>
  • Loading branch information
Balaji Srinivasan authored and rlubos committed Feb 22, 2024
1 parent 0eae030 commit 2fb8a26
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ Networking samples
* The format of the :file:`.pem` file to the pem format.
* The sample to automatically convert the :file:`.pem` file to hex format so it can be included.
* The sample to gracefully bring down the network interfaces.
* Renamed :file:`overlay-pdn_ipv4.conf` to :file:`overlay-pdn-nrf91-ipv4.conf` and :file:`overlay-tfm_mbedtls.conf` to :file:`overlay-tfm-nrf91.conf`.

* :ref:`download_sample` sample:

Expand Down
14 changes: 7 additions & 7 deletions samples/net/https_client/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ This certificate is provided in the :file:`samples/net/https_client/cert` folder
To connect to other servers, you might need to provision a different certificate.
See :ref:`cert_dwload` for more information.

Using Mbed TLS and TF-M
***********************
Using Mbed TLS and TF-M on nRF91 Series DKs
*******************************************

This sample supports using Mbed TLS and Trusted Firmware-M (TF-M).
Instead of offloading the TLS sockets into the modem, you can use the Mbed TLS library from Zephyr.
Expand All @@ -69,19 +69,19 @@ Building and running

.. include:: /includes/build_and_run_ns.txt

To build the sample with Mbed TLS and TF-M, add the following to your west build command:
To build the sample with Mbed TLS and TF-M for the nRF91 Series DKs, add the following to your west build command:

.. code-block:: none
-DOVERLAY_CONFIG=overlay-tfm_mbedtls.conf
-DOVERLAY_CONFIG=overlay-tfm-nrf91.conf
The default packet data network (PDN) configuration is dual stack, which will use an IPv6 address if available (and IPv4 if not).

For testing IPv4 only, you might need to configure the packet data network settings, adding the following to your build command:
On the nRF91 Series DKs, for testing IPv4 only, you might need to configure the packet data network settings, adding the following to your build command:

.. code-block:: none
-DOVERLAY_CONFIG=overlay-pdn_ipv4.conf
-DOVERLAY_CONFIG=overlay-pdn-nrf91-ipv4.conf
Testing
=======
Expand Down Expand Up @@ -136,7 +136,7 @@ Output for the default configuration, where the carrier does support IPv6:
Finished, closing socket.
PDP context 0 deactivated
Output where you override the default packet data network (PDN) configuration to IPv4 only, via the `overlay-pdn_ipv4.conf` overlay:
Output where you override the default packet data network (PDN) configuration to IPv4 only, using the ``overlay-pdn-nrf91-ipv4.conf`` overlay:

.. code-block:: console
Expand Down
13 changes: 12 additions & 1 deletion samples/net/https_client/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,18 @@ tests:
tags: ci_build
sample.net.https_client.lte.tfm-mbedtls:
build_only: true
extra_args: OVERLAY_CONFIG="overlay-tfm_mbedtls.conf"
extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf"
integration_platforms:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
platform_allow:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
- nrf9151dk_nrf9151_ns
tags: ci_build
sample.net.https_client.lte.pdn-ipv4:
build_only: true
extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf"
integration_platforms:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
Expand Down

0 comments on commit 2fb8a26

Please sign in to comment.