From e8abbcfbdf63437a640d5fd87b7e191caab6445e Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Fri, 24 Mar 2023 08:57:43 +0100 Subject: [PATCH] Update CHANGELOG for 3.21.0 Update CHANGELOG for 3.21.0 and collect Tested-by tags. Tested-by: Clement Faure (imx-mx6dlsabresd) Tested-by: Clement Faure (imx-mx6qsabresd) Tested-by: Clement Faure (imx-mx6sllevk) Tested-by: Clement Faure (imx-mx6sxsabresd) Tested-by: Clement Faure (imx-mx6ulevk) Tested-by: Clement Faure (imx-mx6ullevk) Tested-by: Clement Faure (imx-mx6ulzevk) Tested-by: Clement Faure (imx-mx7dsabresd) Tested-by: Clement Faure (imx-mx7ulpevk) Tested-by: Clement Faure (imx-mx8mmevk) Tested-by: Clement Faure (imx-mx8mnevk) Tested-by: Clement Faure (imx-mx8mqevk) Tested-by: Clement Faure (imx-mx8mpevk) Tested-by: Clement Faure (imx-mx8qmmek) Tested-by: Clement Faure (imx-mx8qxpmek) Tested-by: Clement Faure (imx-mx8ulpevk) Tested-by: Clement Faure (imx-mx93evk) Tested-by: Jens Wiklander (Juno) Tested-by: Jerome Forissier (vexpress-qemu_virt) Tested-by: Jerome Forissier (vexpress-qemu_armv8a) Tested-by: Jerome Forissier (rockchip-rk3399) (RockPi4B) Tested-by: Jens Wiklander (imx-mx8mqevk) Tested-by: Igor Opaniuk (Poplar) Tested-by: Jens Wiklander (vexpress-fvp) Tested-by: Etienne Carriere (stm32mp1-157C_DK2) Tested-by: Etienne Carriere (stm32mp1-157C_EV1) Tested-by: Joakim Bech (RPi3B) Tested-by: Ricardo Salveti (ZynqMP) Signed-off-by: Jerome Forissier --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ mk/config.mk | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ec133c7581..1ff17d31365 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +# OP-TEE - version 3.21.0 (2023-04-14) + +- 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_21], [commits][OP_TEE_optee_os_commits_3_21] and [pull requests][OP_TEE_optee_os_pr_3_21] + - OP-TEE/optee_client: [release page][OP_TEE_optee_client_release_3_21], [commits][OP_TEE_optee_client_commits_3_21] and [pull requests][OP_TEE_optee_client_pr_3_21] + - OP-TEE/optee_test: [release page][OP_TEE_optee_test_release_3_21], [commits][OP_TEE_optee_test_commits_3_21] and [pull requests][OP_TEE_optee_test_pr_3_21] + - OP-TEE/build: [release page][OP_TEE_build_release_3_21], [commits][OP_TEE_build_commits_3_21] and [pull requests][OP_TEE_build_pr_3_21] + - linaro-swg/optee_examples: [release page][linaro_swg_optee_examples_release_3_21], [commits][linaro_swg_optee_examples_commits_3_21] and [pull requests][linaro_swg_optee_examples_pr_3_21] + + +[OP_TEE_optee_os_release_3_21]: https://github.com/OP-TEE/optee_os/releases/tag/3.21.0 +[OP_TEE_optee_os_commits_3_21]: https://github.com/OP-TEE/optee_os/compare/3.20.0...3.21.0 +[OP_TEE_optee_os_pr_3_21]: https://github.com/OP-TEE/optee_os/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2023-01-20..2023-04-14 + +[OP_TEE_optee_client_release_3_21]: https://github.com/OP-TEE/optee_client/releases/tag/3.21.0 +[OP_TEE_optee_client_commits_3_21]: https://github.com/OP-TEE/optee_client/compare/3.20.0...3.21.0 +[OP_TEE_optee_client_pr_3_21]: https://github.com/OP-TEE/optee_client/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2023-01-20..2023-04-14 + +[OP_TEE_optee_test_release_3_21]: https://github.com/OP-TEE/optee_test/releases/tag/3.21.0 +[OP_TEE_optee_test_commits_3_21]: https://github.com/OP-TEE/optee_test/compare/3.20.0...3.21.0 +[OP_TEE_optee_test_pr_3_21]: https://github.com/OP-TEE/optee_test/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2023-01-20..2023-04-14 + +[OP_TEE_build_release_3_21]: https://github.com/OP-TEE/build/releases/tag/3.21.0 +[OP_TEE_build_commits_3_21]: https://github.com/OP-TEE/build/compare/3.20.0...3.21.0 +[OP_TEE_build_pr_3_21]: https://github.com/OP-TEE/build/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2023-01-20..2023-04-14 + +[linaro_swg_optee_examples_release_3_21]: https://github.com/linaro-swg/optee_examples/releases/tag/3.21.0 +[linaro_swg_optee_examples_commits_3_21]: https://github.com/linaro-swg/optee_examples/compare/3.20.0...3.21.0 +[linaro_swg_optee_examples_pr_3_21]: https://github.com/linaro-swg/optee_examples/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2023-01-20..2023-04-14 + # OP-TEE - version 3.20.0 (2023-01-20) - 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 029ca862fe2..f5d1fa0a2d1 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -127,7 +127,7 @@ CFG_OS_REV_REPORTS_GIT_SHA1 ?= y # 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 ?= 20 +CFG_OPTEE_REVISION_MINOR ?= 21 CFG_OPTEE_REVISION_EXTRA ?= # Trusted OS implementation version