Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: doc fixes related to spm deprecation #8647

Merged
merged 1 commit into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/nrf/libraries/others/spm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Secure Partition Manager (SPM)
:depth: 2

The Secure Partition Manager (SPM) provides functionality for the Trusted Execution Environment of the nRF9160 SiP and the nRF5340 SoC.
As of |NCS| v2.1.0, the Secure Partition Manager is replaced by the Trusted Firmware-M (TF-M) and deprecated.
It will be removed in a future release of the |NCS|.

See :ref:`ug_tfm` for more information about the TF-M.

Overview
********
Expand Down
1 change: 0 additions & 1 deletion doc/nrf/releases/release-notes-changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ This section provides detailed lists of changes by :ref:`sample <sample>`, inclu
For lists of protocol-specific changes, see `Protocols`_.

* All samples running on non-secure boards are documented to use TF-M as the trusted execution solution, as SPM is deprecated.
Sample :ref:`secure_partition_manager` is the exception.

Bluetooth samples
-----------------
Expand Down