From 2a5b1d1232f582056184367fb58a425ac7478ec6 Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Wed, 4 Oct 2023 15:16:33 +0200 Subject: [PATCH] Update CHANGELOG for 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update CHANGELOG for 4.0.0 and collect Tested-by tags. Tested-by: Johann Neuhauser (stm32mp1-157C_DHCOM_PDK2) Tested-by: Jorge Ramirez-Ortiz (versal) Tested-by: Ilies CHERGUI (QEMUv8) 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: György Szing (FVP_Base_RevC-2xAEMvA) Tested-by: Jens Wiklander (Juno) Tested-by: Jerome Forissier (vexpress-qemu_armv8a) Tested-by: Jerome Forissier (rockchip-rk3399) (Rockpi4B) Tested-by: Jerome Forissier (vexpress-qemu_virt) Tested-by: Ricardo Salveti (ZynqMP) Tested-by: Ricardo Salveti (k3-am62x) Tested-by: Etienne Carriere (stm32mp1-135F_DK) Tested-by: Etienne Carriere (stm32mp1-157C_DK2) Tested-by: Etienne Carriere (stm32mp1-157C_EV1) Tested-by: Jens Wiklander (imx-mx8mqevk) Tested-by: Jens Wiklander (FVP) Tested-by: Jens Wiklander (Hikey) Tested-by: Joakim Bech (Rpi3B) Signed-off-by: Jerome Forissier --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ mk/config.mk | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333a689e639..44f5f99b49b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +# OP-TEE - version 4.0.0 (2023-10-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_4_0], [commits][OP_TEE_optee_os_commits_4_0] and [pull requests][OP_TEE_optee_os_pr_4_0] + - OP-TEE/optee_client: [release page][OP_TEE_optee_client_release_4_0], [commits][OP_TEE_optee_client_commits_4_0] and [pull requests][OP_TEE_optee_client_pr_4_0] + - OP-TEE/optee_test: [release page][OP_TEE_optee_test_release_4_0], [commits][OP_TEE_optee_test_commits_4_0] and [pull requests][OP_TEE_optee_test_pr_4_0] + - OP-TEE/build: [release page][OP_TEE_build_release_4_0], [commits][OP_TEE_build_commits_4_0] and [pull requests][OP_TEE_build_pr_4_0] + - linaro-swg/optee_examples: [release page][linaro_swg_optee_examples_release_4_0], [commits][linaro_swg_optee_examples_commits_4_0] and [pull requests][linaro_swg_optee_examples_pr_4_0] + + +[OP_TEE_optee_os_release_4_0]: https://github.com/OP-TEE/optee_os/releases/tag/4.0.0 +[OP_TEE_optee_os_commits_4_0]: https://github.com/OP-TEE/optee_os/compare/3.22.0...4.0.0 +[OP_TEE_optee_os_pr_4_0]: https://github.com/OP-TEE/optee_os/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A..2023-10-20 + +[OP_TEE_optee_client_release_4_0]: https://github.com/OP-TEE/optee_client/releases/tag/4.0.0 +[OP_TEE_optee_client_commits_4_0]: https://github.com/OP-TEE/optee_client/compare/3.22.0...4.0.0 +[OP_TEE_optee_client_pr_4_0]: https://github.com/OP-TEE/optee_client/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A..2023-10-20 + +[OP_TEE_optee_test_release_4_0]: https://github.com/OP-TEE/optee_test/releases/tag/4.0.0 +[OP_TEE_optee_test_commits_4_0]: https://github.com/OP-TEE/optee_test/compare/3.22.0...4.0.0 +[OP_TEE_optee_test_pr_4_0]: https://github.com/OP-TEE/optee_test/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A..2023-10-20 + +[OP_TEE_build_release_4_0]: https://github.com/OP-TEE/build/releases/tag/4.0.0 +[OP_TEE_build_commits_4_0]: https://github.com/OP-TEE/build/compare/3.22.0...4.0.0 +[OP_TEE_build_pr_4_0]: https://github.com/OP-TEE/build/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A..2023-10-20 + +[linaro_swg_optee_examples_release_4_0]: https://github.com/linaro-swg/optee_examples/releases/tag/4.0.0 +[linaro_swg_optee_examples_commits_4_0]: https://github.com/linaro-swg/optee_examples/compare/3.22.0...4.0.0 +[linaro_swg_optee_examples_pr_4_0]: https://github.com/linaro-swg/optee_examples/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A..2023-10-20 + # OP-TEE - version 3.22 (2023-07-07) - 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 8aed0995f1e..a9a68e3a48d 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -120,8 +120,8 @@ CFG_OS_REV_REPORTS_GIT_SHA1 ?= y # we might be outside of a Git environment, or the tree may have been cloned # 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 ?= 22 +CFG_OPTEE_REVISION_MAJOR ?= 4 +CFG_OPTEE_REVISION_MINOR ?= 0 CFG_OPTEE_REVISION_EXTRA ?= # Trusted OS implementation version