diff --git a/doc/_utils/redirects.py b/doc/_utils/redirects.py index e4bd18ced5d2..7fac78fa65dc 100644 --- a/doc/_utils/redirects.py +++ b/doc/_utils/redirects.py @@ -261,4 +261,16 @@ ("libraries/nrf_security/doc/drivers", "libraries/security/nrf_security/doc/drivers"), ("libraries/nrf_security/doc/mbed_tls_header", "libraries/security/nrf_security/doc/mbed_tls_header"), ("libraries/bin/bt_ll_acs_nrf53/index", "nrfxlib/softdevice_controller/doc/isochronous_channels"), + ("libraries/others/fatal_error", "libraries/security/fatal_error"), + ("libraries/others/flash_patch", "libraries/security/bootloader/flash_patch"), + ("libraries/others/fprotect", "libraries/security/bootloader/fprotect"), + ("libraries/others/fw_info", "libraries/security/bootloader/fw_info"), + ("libraries/others/hw_unique_key", "libraries/security/hw_unique_key"), + ("libraries/others/identity_key", "libraries/security/identity_key"), + ("libraries/tfm/index", "libraries/security/tfm/index"), + ("libraries/tfm/tfm_ioctl_api", "libraries/security/tfm/tfm_ioctl_api"), + ("libraries/bootloader/bl_crypto", "libraries/security/bootloader/bl_crypto"), + ("libraries/bootloader/bl_storage", "libraries/security/bootloader/bl_storage"), + ("libraries/bootloader/bl_validation", "libraries/security/bootloader/bl_validation"), + ("libraries/bootloader/index", "libraries/security/bootloader/index"), ] diff --git a/doc/nrf/libraries/bootloader/bl_crypto.rst b/doc/nrf/libraries/security/bootloader/bl_crypto.rst similarity index 100% rename from doc/nrf/libraries/bootloader/bl_crypto.rst rename to doc/nrf/libraries/security/bootloader/bl_crypto.rst diff --git a/doc/nrf/libraries/bootloader/bl_storage.rst b/doc/nrf/libraries/security/bootloader/bl_storage.rst similarity index 100% rename from doc/nrf/libraries/bootloader/bl_storage.rst rename to doc/nrf/libraries/security/bootloader/bl_storage.rst diff --git a/doc/nrf/libraries/bootloader/bl_validation.rst b/doc/nrf/libraries/security/bootloader/bl_validation.rst similarity index 100% rename from doc/nrf/libraries/bootloader/bl_validation.rst rename to doc/nrf/libraries/security/bootloader/bl_validation.rst diff --git a/doc/nrf/libraries/others/flash_patch.rst b/doc/nrf/libraries/security/bootloader/flash_patch.rst similarity index 100% rename from doc/nrf/libraries/others/flash_patch.rst rename to doc/nrf/libraries/security/bootloader/flash_patch.rst diff --git a/doc/nrf/libraries/others/fprotect.rst b/doc/nrf/libraries/security/bootloader/fprotect.rst similarity index 100% rename from doc/nrf/libraries/others/fprotect.rst rename to doc/nrf/libraries/security/bootloader/fprotect.rst diff --git a/doc/nrf/libraries/others/fw_info.rst b/doc/nrf/libraries/security/bootloader/fw_info.rst similarity index 100% rename from doc/nrf/libraries/others/fw_info.rst rename to doc/nrf/libraries/security/bootloader/fw_info.rst diff --git a/doc/nrf/libraries/bootloader/index.rst b/doc/nrf/libraries/security/bootloader/index.rst similarity index 100% rename from doc/nrf/libraries/bootloader/index.rst rename to doc/nrf/libraries/security/bootloader/index.rst diff --git a/doc/nrf/libraries/others/fatal_error.rst b/doc/nrf/libraries/security/fatal_error.rst similarity index 100% rename from doc/nrf/libraries/others/fatal_error.rst rename to doc/nrf/libraries/security/fatal_error.rst diff --git a/doc/nrf/libraries/others/hw_unique_key.rst b/doc/nrf/libraries/security/hw_unique_key.rst similarity index 100% rename from doc/nrf/libraries/others/hw_unique_key.rst rename to doc/nrf/libraries/security/hw_unique_key.rst diff --git a/doc/nrf/libraries/others/identity_key.rst b/doc/nrf/libraries/security/identity_key.rst similarity index 100% rename from doc/nrf/libraries/others/identity_key.rst rename to doc/nrf/libraries/security/identity_key.rst diff --git a/doc/nrf/libraries/security/index.rst b/doc/nrf/libraries/security/index.rst index 8930ee9ea5cf..0b7285b194cb 100644 --- a/doc/nrf/libraries/security/index.rst +++ b/doc/nrf/libraries/security/index.rst @@ -8,5 +8,7 @@ Security libraries :glob: :caption: Subpages: + bootloader/index nrf_security/index + tfm/index * diff --git a/doc/nrf/libraries/tfm/index.rst b/doc/nrf/libraries/security/tfm/index.rst similarity index 100% rename from doc/nrf/libraries/tfm/index.rst rename to doc/nrf/libraries/security/tfm/index.rst diff --git a/doc/nrf/libraries/tfm/tfm_ioctl_api.rst b/doc/nrf/libraries/security/tfm/tfm_ioctl_api.rst similarity index 90% rename from doc/nrf/libraries/tfm/tfm_ioctl_api.rst rename to doc/nrf/libraries/security/tfm/tfm_ioctl_api.rst index 9f45289955ba..ad5bfc0151fb 100644 --- a/doc/nrf/libraries/tfm/tfm_ioctl_api.rst +++ b/doc/nrf/libraries/security/tfm/tfm_ioctl_api.rst @@ -22,7 +22,7 @@ Wrapper functions for these accesses are defined in :file:`tfm_ioctl_ns_api.c` a The supported platform services are defined by :c:struct:`tfm_platform_ioctl_core_reqest_types_t` in :file:`tfm_ioctl_core_api.h`. -.. literalinclude:: ../../../../../modules/tee/tf-m/trusted-firmware-m/platform/ext/target/nordic_nrf/common/core/services/include/tfm_ioctl_core_api.h +.. literalinclude:: ../../../../../../modules/tee/tf-m/trusted-firmware-m/platform/ext/target/nordic_nrf/common/core/services/include/tfm_ioctl_core_api.h :language: c :start-at: /** @brief Supported request types. :end-before: /** @brief Argument list for each platform read service. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index bc98500c2dfe..164f2d764bf4 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -758,6 +758,7 @@ Documentation * The :ref:`ug_wifi_overview` page by separating the information about Wi-Fi certification into its own :ref:`ug_wifi_certification` page under :ref:`ug_wifi`. * The :ref:`ug_bt_mesh_configuring` page with an example of possible entries in the Settings NVS name cache. + * The :ref:`lib_security` page to include all security-related libraries. * Fixed: