diff options
author | Minos Galanakis <minos.galanakis@arm.com> | 2020-03-10 15:37:20 +0000 |
---|---|---|
committer | Minos Galanakis <minos.galanakis@arm.com> | 2020-03-27 14:27:07 +0000 |
commit | 0768982ea41b5e7d207445f19ee23e5d67d9c89b (patch) | |
tree | 5c9f14a2dd4d1bf3c5c58e45574b1402e87ba1e0 | |
parent | d8efe8f9084aafd06af8c70c1ca10745d486f6db (diff) | |
download | trusted-firmware-m-TF-Mv1.0.tar.gz |
Version: Update for TF-M v1.0 releaseTF-Mv1.0
This patch updates the TF-M version for the
following components to v1.0
* Trusted Firmware-M
* User guide
* User manual
Change-Id: If9b4dfd077d2ae7a2bf415612216572a43a01b39
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
-rw-r--r-- | cmake/Common/BuildDoxygenDoc.cmake | 4 | ||||
-rw-r--r-- | cmake/Common/BuildSphinxDoc.cmake | 6 | ||||
-rw-r--r-- | secure_fw/core/include/tfm_version.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Common/BuildDoxygenDoc.cmake b/cmake/Common/BuildDoxygenDoc.cmake index f0ca6f624a..79f536ecc8 100644 --- a/cmake/Common/BuildDoxygenDoc.cmake +++ b/cmake/Common/BuildDoxygenDoc.cmake @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2018-2019, Arm Limited. All rights reserved. +# Copyright (c) 2018-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -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-RC3") + set(DOXYCFG_TFM_VERSION "v1.0") #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 02575393a2..65487446ae 100644 --- a/cmake/Common/BuildSphinxDoc.cmake +++ b/cmake/Common/BuildSphinxDoc.cmake @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2019, Arm Limited. All rights reserved. +# Copyright (c) 2019-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -84,8 +84,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-RC3") - set(SPHINXCFG_TFM_VERSION_FULL "Version 1.0-RC3") + set(SPHINXCFG_TFM_VERSION "v1.0") + set(SPHINXCFG_TFM_VERSION_FULL "Version 1.0") get_filename_component(_NDX_FILE_DIR ${SPHINX_CONFIGURED_INDEX_FILE} DIRECTORY ) diff --git a/secure_fw/core/include/tfm_version.h b/secure_fw/core/include/tfm_version.h index 459dc8e13a..461ba97414 100644 --- a/secure_fw/core/include/tfm_version.h +++ b/secure_fw/core/include/tfm_version.h @@ -13,6 +13,6 @@ */ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 -#define VERSION_STRING "RC3" +#define VERSION_STRING "" #endif /* __TFM_VERSION_H__ */ |