diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | docs/contributing/platform_deprecation.rst | 2 | ||||
-rw-r--r-- | docs/getting_started/tfm_build_instruction.rst | 2 | ||||
-rw-r--r-- | docs/introduction/readme.rst | 2 | ||||
-rw-r--r-- | secure_fw/spm/include/tfm_version.h | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bfafb120c..735586ccf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15) -set(TFM_VERSION 1.1.0) +set(TFM_VERSION 1.2.0) ############################ CONFIGURATION ##################################### diff --git a/docs/contributing/platform_deprecation.rst b/docs/contributing/platform_deprecation.rst index 71cda15d4a..d9d00ff3b7 100644 --- a/docs/contributing/platform_deprecation.rst +++ b/docs/contributing/platform_deprecation.rst @@ -54,7 +54,7 @@ release. | | after | | | | release | | +==============================+===========+===================================+ -| mps2/an539 | 1.2 | N.A | +| mps2/an539 | v1.2.0 | N.A | +------------------------------+-----------+-----------------------------------+ -------------- diff --git a/docs/getting_started/tfm_build_instruction.rst b/docs/getting_started/tfm_build_instruction.rst index 6418d34a84..2c5d67b606 100644 --- a/docs/getting_started/tfm_build_instruction.rst +++ b/docs/getting_started/tfm_build_instruction.rst @@ -472,7 +472,7 @@ automatic downloading for that dependency. +----------------+--------------------+-----------------------------------------------------+ | tf-m-tests | TFM_TEST_REPO_PATH | https://git.trustedfirmware.org/TF-M/tf-m-tests.git | +----------------+--------------------+-----------------------------------------------------+ -| MCUboot | MCUBOOT_PATH | https://github.com/mcu-tools/mcuboot | +| MCUboot | MCUBOOT_PATH | https://github.com/mcu-tools/mcuboot | +----------------+--------------------+-----------------------------------------------------+ | psa-arch-tests | PSA_ARCH_TEST_PATH | https://github.com/ARM-software/psa-arch-tests | +----------------+--------------------+-----------------------------------------------------+ diff --git a/docs/introduction/readme.rst b/docs/introduction/readme.rst index b53c12c2e6..914ea6da21 100644 --- a/docs/introduction/readme.rst +++ b/docs/introduction/readme.rst @@ -186,6 +186,8 @@ Version history | v1.0 | 2020-03-27 | 1.0 release | v20.03_API1.0 | +-------------+--------------+--------------------+-------------------+ | v1.1 | 2020-07-15 | 1.1 release | 1f960947 | ++---------------------------------------------------------------------+ +| v1.2.0 | 2020-11-25 | 1.2.0 release | 90c8e680 | +-------------+--------------+--------------------+-------------------+ Please refer to diff --git a/secure_fw/spm/include/tfm_version.h b/secure_fw/spm/include/tfm_version.h index 25354e9334..82e1e0e55c 100644 --- a/secure_fw/spm/include/tfm_version.h +++ b/secure_fw/spm/include/tfm_version.h @@ -12,7 +12,7 @@ * Defines for TFM version. */ #define VERSION_MAJOR 1 -#define VERSION_MINOR 1 +#define VERSION_MINOR 2 #define VERSION_HOTFIX 0 #define VERSION_STRING "" |