Skip to content

Commit 698d1ab

Browse files
greg-fernordicjm
authored andcommitted
doc: tf-m: remove SPM migration guide
Removed the migration guide for SPM to TF-M from the documentation. NCSDK-32738. Signed-off-by: Grzegorz Ferenc <[email protected]>
1 parent 8689412 commit 698d1ab

File tree

5 files changed

+6
-61
lines changed

5 files changed

+6
-61
lines changed

doc/nrf/links.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,8 @@
473473
.. _`known issues for nRF Connect SDK v1.4.1`: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/releases_and_maturity/known_issues.html?v=v1-4-1
474474
.. _`known issues for nRF Connect SDK v1.4.0`: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/releases_and_maturity/known_issues.html?v=v1-4-0
475475

476+
.. _`Migrating from Secure Partition Manager to Trusted Firmware-M`: https://docs.nordicsemi.com/bundle/ncs-2.0.0/page/nrf/ug_tfm.html#migrating_from_secure_partition_manager_to_trusted_firmware-m
477+
476478
.. _`connecting to nRF Cloud`: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/libraries/networking/nrf_cloud.html#connecting
477479

478480
.. _`TF-M documentation`: https://docs.nordicsemi.com/bundle/ncs-latest/page/tfm/index.html

doc/nrf/releases_and_maturity/migration/migration_guide_1.x_to_2.x.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Trusted Firmware M (TF-M) replaces the Secure Partition Manager (SPM) for secure
4646
TF-M is now enabled by default for most nRF9160 and nRF5340 applications and samples.
4747

4848
Required action:
49-
To start using TF-M instead of SPM in your application, see the information in :ref:`spm_to_tfm_migration`.
49+
To start using TF-M instead of SPM in your application, see the information in `Migrating from Secure Partition Manager to Trusted Firmware-M`_ in the |NCS| v2.0.0 documentation.
5050

5151
Switch from TinyCBOR to zcbor
5252
*****************************

doc/nrf/releases_and_maturity/migration/migration_guide_spm_to_tf-m.rst

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,3 +1203,5 @@ Documentation
12031203
* The standalone page for getting started with the nRF9160 DK.
12041204
This page has been replaced by the `Quick Start app`_ that supports the nRF9160 DK.
12051205
The content about connecting the DK to nRF Cloud is now a standalone :ref:`nrf9160_gs_connecting_dk_to_cloud` page in the :ref:`ug_nrf9160` section.
1206+
* The section about migrating from Secure Partition Manager to Trusted Firmware-M, which was removed in the |NCS| v2.1.0 release.
1207+
If you still need to migrate, see the `information in the nRF Connect SDK v2.0.0 documentation <Migrating from Secure Partition Manager to Trusted Firmware-M_>`_.

doc/nrf/security/tfm/tfm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ TF-M's Secure Partition Manager (SPM) backend may also be configured, depending
130130

131131
.. note::
132132
Do not confuse TF-M's Secure Partition Manager with Secure Partition Manager that was removed in the |NCS| v2.1.0.
133-
See :ref:`migration guide <spm_to_tfm_migration>`.
133+
See also `Migrating from Secure Partition Manager to Trusted Firmware-M`_ in the |NCS| v2.0.0 documentation.
134134

135135
.. list-table:: SPM backends
136136
:header-rows: 1

0 commit comments

Comments
 (0)