diff options
-rw-r--r-- | cmake/Common/BuildDoxygenDoc.cmake | 2 | ||||
-rw-r--r-- | cmake/Common/BuildSphinxDoc.cmake | 4 | ||||
-rw-r--r-- | readme.rst | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmake/Common/BuildDoxygenDoc.cmake b/cmake/Common/BuildDoxygenDoc.cmake index 272948fdba..cee474246e 100644 --- a/cmake/Common/BuildDoxygenDoc.cmake +++ b/cmake/Common/BuildDoxygenDoc.cmake @@ -85,7 +85,7 @@ if (NOT NODOC) #Version ID of TF-M. #TODO: this shall not be hard-coded here. A process need to defined for # versioning the document (and TF-M). - set(DOXYCFG_TFM_VERSION "v1.0-RC1") + set(DOXYCFG_TFM_VERSION "v1.0-RC2") #Using add_custom_command allows CMake to generate proper clean commands #for document generation. diff --git a/cmake/Common/BuildSphinxDoc.cmake b/cmake/Common/BuildSphinxDoc.cmake index 9027495099..74ead011b9 100644 --- a/cmake/Common/BuildSphinxDoc.cmake +++ b/cmake/Common/BuildSphinxDoc.cmake @@ -83,8 +83,8 @@ if (NOT SPHINX_NODOC) #Version ID of TF-M. #TODO: this shall not be hard-coded here. We need a process to define the # version number of the document (and TF-M). - set(SPHINXCFG_TFM_VERSION "v1.0-RC1") - set(SPHINXCFG_TFM_VERSION_FULL "Version 1.0-RC1") + set(SPHINXCFG_TFM_VERSION "v1.0-RC2") + set(SPHINXCFG_TFM_VERSION_FULL "Version 1.0-RC2") get_filename_component(_NDX_FILE_DIR ${SPHINX_CONFIGURED_INDEX_FILE} DIRECTORY ) diff --git a/readme.rst b/readme.rst index d754694c26..78368f9993 100644 --- a/readme.rst +++ b/readme.rst @@ -1,5 +1,5 @@ ############################# -Trusted Firmware M - v1.0-RC1 +Trusted Firmware M - v1.0-RC2 ############################# Trusted Firmware M provides a reference implementation of secure world software for ARMv8-M. @@ -51,6 +51,7 @@ This release includes: - Crypto Service (PSA API 1.0-beta-1) - TF-M Audit Log - Platform Service + - Internal Trusted Storage (PSA API 1.0.0) - PSA IPC support - Support for Armv8-M mainline and baseline @@ -141,6 +142,8 @@ Version history +-------------+--------------+--------------------+ | v1.0-RC1 | 2019-05-31 | 1.0-RC1 release | +-------------+--------------+--------------------+ +| v1.0-RC2 | 2019-10-09 | 1.0-RC2 release | ++-------------+--------------+--------------------+ -------------- |