From 3d47a131bca1d9ed511bfd516aa5e70269e12c1d Mon Sep 17 00:00:00 2001 From: Joakim Bech Date: Mon, 28 Dec 2020 09:28:21 +0100 Subject: [PATCH] Update CHANGELOG for 3.12.0 Update CHANGELOG for 3.12.0 and collect Tested-by tags. Signed-off-by: Joakim Bech Tested-by: Clement Faure (mx6dlsabreauto) Tested-by: Clement Faure (mx6dlsabresd) Tested-by: Clement Faure (mx6qpsabreauto) Tested-by: Clement Faure (mx6sllevk) Tested-by: Clement Faure (mx6ulevk) Tested-by: Clement Faure (mx6ullevk) Tested-by: Clement Faure (mx6ulzevk) Tested-by: Clement Faure (mx7dsabresd) Tested-by: Clement Faure (mx7ulpevk) Tested-by: Clement Faure (mx8mmevk) Tested-by: Clement Faure (mx8mnevk) Tested-by: Clement Faure (mx8mqevk) Tested-by: Clement Faure (mx8qmmek) Tested-by: Clement Faure (mx8qxpmek) Tested-by: Etienne Carriere (stm32mp1) Tested-by: Igor Opaniuk (Poplar) Tested-by: Jens Wiklander (FVP) Tested-by: Jens Wiklander (Juno) Tested-by: Jerome Forissier ((HiKey GP) # issue 4324) Tested-by: Jerome Forissier ((HiKey960 GP) # issue 4324) Tested-by: Jerome Forissier (QEMU) Tested-by: Jerome Forissier (QEMUv8) Tested-by: Joakim Bech (RPi3B) Tested-by: Joakim Bech (RPi3B-NFS) Tested-by: Ricardo Salveti (ZynqMP) Tested-by: Rouven Czerwinski (imx-ccimx6ulsbcpro) Tested-by: Rouven Czerwinski (imx-mx6qsabrelite) Tested-by: Sumit Garg (Developerbox) Tested-by: Victor Chong (HiKey960 AOSP P) Tested-by: Volodymyr Babchuk (Rcar H3) Tested-by: Volodymyr Babchuk (Rcar H3/virtualization) --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ mk/config.mk | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f1d7dbfbb..b755125adba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +# OP-TEE - version 3.12.0 (2021-01-20) + +- Links to the release pages, commits and pull requests merged into this release for: + - OP-TEE/optee_os: [release page][OP_TEE_optee_os_release_3_12_0], [commits][OP_TEE_optee_os_commits_3_12_0] and [pull requests][OP_TEE_optee_os_pr_3_12_0] + - OP-TEE/optee_client: [release page][OP_TEE_optee_client_release_3_12_0], [commits][OP_TEE_optee_client_commits_3_12_0] and [pull requests][OP_TEE_optee_client_pr_3_12_0] + - OP-TEE/optee_test: [release page][OP_TEE_optee_test_release_3_12_0], [commits][OP_TEE_optee_test_commits_3_12_0] and [pull requests][OP_TEE_optee_test_pr_3_12_0] + - OP-TEE/build: [release page][OP_TEE_build_release_3_12_0], [commits][OP_TEE_build_commits_3_12_0] and [pull requests][OP_TEE_build_pr_3_12_0] + - linaro-swg/optee_examples: [release page][linaro_swg_optee_examples_release_3_12_0], [commits][linaro_swg_optee_examples_commits_3_12_0] and [pull requests][linaro_swg_optee_examples_pr_3_12_0] + + +[OP_TEE_optee_os_release_3_12_0]: https://github.com/OP-TEE/optee_os/releases/tag/3.12.0 +[OP_TEE_optee_os_commits_3_12_0]: https://github.com/OP-TEE/optee_os/compare/3.11.0...3.12.0 +[OP_TEE_optee_os_pr_3_12_0]: https://github.com/OP-TEE/optee_os/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-10-16..2021-01-20 + +[OP_TEE_optee_client_release_3_12_0]: https://github.com/OP-TEE/optee_client/releases/tag/3.12.0 +[OP_TEE_optee_client_commits_3_12_0]: https://github.com/OP-TEE/optee_client/compare/3.11.0...3.12.0 +[OP_TEE_optee_client_pr_3_12_0]: https://github.com/OP-TEE/optee_client/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-10-16..2021-01-20 + +[OP_TEE_optee_test_release_3_12_0]: https://github.com/OP-TEE/optee_test/releases/tag/3.12.0 +[OP_TEE_optee_test_commits_3_12_0]: https://github.com/OP-TEE/optee_test/compare/3.11.0...3.12.0 +[OP_TEE_optee_test_pr_3_12_0]: https://github.com/OP-TEE/optee_test/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-10-16..2021-01-20 + +[OP_TEE_build_release_3_12_0]: https://github.com/OP-TEE/build/releases/tag/3.12.0 +[OP_TEE_build_commits_3_12_0]: https://github.com/OP-TEE/build/compare/3.11.0...3.12.0 +[OP_TEE_build_pr_3_12_0]: https://github.com/OP-TEE/build/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-10-16..2021-01-20 + +[linaro_swg_optee_examples_release_3_12_0]: https://github.com/linaro-swg/optee_examples/releases/tag/3.12.0 +[linaro_swg_optee_examples_commits_3_12_0]: https://github.com/linaro-swg/optee_examples/compare/3.11.0...3.12.0 +[linaro_swg_optee_examples_pr_3_12_0]: https://github.com/linaro-swg/optee_examples/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-10-16..2021-01-20 + # OP-TEE - version 3.11.0 (2020-10-16) - Links to the release pages, commits and pull requests merged into this release for: diff --git a/mk/config.mk b/mk/config.mk index e0127b21b46..72f13fba4fb 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -122,7 +122,7 @@ endif # with limited depth not including any tag, so there is really no guarantee # that TEE_IMPL_VERSION contains the major and minor revision numbers. CFG_OPTEE_REVISION_MAJOR ?= 3 -CFG_OPTEE_REVISION_MINOR ?= 11 +CFG_OPTEE_REVISION_MINOR ?= 12 # Trusted OS implementation manufacturer name CFG_TEE_MANUFACTURER ?= LINARO