Update CHANGELOG for 4.2.0

Update CHANGELOG for 4.2.0 and collect Tested-by tags. Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Tested-by: Etienne Carriere <etienne.carriere@foss.st.com> (stm32mp1-135F_DK w/ pkcs11) Tested-by: Etienne Carriere <etienne.carriere@foss.st.com> (stm32mp1-157C_DK2_SCMI w/ pkcs11) Tested-by: Etienne Carriere <etienne.carriere@foss.st.com> (stm32mp1-157C_EV1 w/ RPMB) Tested-by: Imre Kis <imre.kis@arm.com> (fvp-ts) Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (FVP) Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (Hikey) Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (imx-mx8mqevk) Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (rockchip-rk3399) (Rockpi4B) Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (vexpress-qemu_armv8a) Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (vexpress-qemu_virt) Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi 3B v1.2) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx6dlsabresd) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx6qsabresd) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx6sllevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx6ulevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx6ulzevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx7dsabresd) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx7ulpevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8dxlevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8mmevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8mnevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8mpevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8mqevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8qmmek) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8qxpmek) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx8ulpevk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (imx-mx93evk) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (LS1012A-RDB) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (LS1046A-RDB) Tested-by: Sahil Malhotra <sahil.malhotra@nxp.com> (LX2160A-RDB)
OP-TEE · Apr 12, 2024 · 12d7c4e · 12d7c4e
1 parent fc57019
commit 12d7c4e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# OP-TEE - version 4.2.0 (2024-04-12)
+
+- 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_2_0], [commits][OP_TEE_optee_os_commits_4_2_0] and [pull requests][OP_TEE_optee_os_pr_4_2_0]
+  - OP-TEE/optee_client: [release page][OP_TEE_optee_client_release_4_2_0], [commits][OP_TEE_optee_client_commits_4_2_0] and [pull requests][OP_TEE_optee_client_pr_4_2_0]
+  - OP-TEE/optee_test: [release page][OP_TEE_optee_test_release_4_2_0], [commits][OP_TEE_optee_test_commits_4_2_0] and [pull requests][OP_TEE_optee_test_pr_4_2_0]
+  - OP-TEE/build: [release page][OP_TEE_build_release_4_2_0], [commits][OP_TEE_build_commits_4_2_0] and [pull requests][OP_TEE_build_pr_4_2_0]
+  - linaro-swg/optee_examples: [release page][linaro_swg_optee_examples_release_4_2_0], [commits][linaro_swg_optee_examples_commits_4_2_0] and [pull requests][linaro_swg_optee_examples_pr_4_2_0]
+
+
+[OP_TEE_optee_os_release_4_2_0]: https://github.com/OP-TEE/optee_os/releases/tag/4.2.0
+[OP_TEE_optee_os_commits_4_2_0]: https://github.com/OP-TEE/optee_os/compare/4.1.0...4.2.0
+[OP_TEE_optee_os_pr_4_2_0]: https://github.com/OP-TEE/optee_os/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-01-19..2024-04-12
+
+[OP_TEE_optee_client_release_4_2_0]: https://github.com/OP-TEE/optee_client/releases/tag/4.2.0
+[OP_TEE_optee_client_commits_4_2_0]: https://github.com/OP-TEE/optee_client/compare/4.1.0...4.2.0
+[OP_TEE_optee_client_pr_4_2_0]: https://github.com/OP-TEE/optee_client/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-01-19..2024-04-12
+
+[OP_TEE_optee_test_release_4_2_0]: https://github.com/OP-TEE/optee_test/releases/tag/4.2.0
+[OP_TEE_optee_test_commits_4_2_0]: https://github.com/OP-TEE/optee_test/compare/4.1.0...4.2.0
+[OP_TEE_optee_test_pr_4_2_0]: https://github.com/OP-TEE/optee_test/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-01-19..2024-04-12
+
+[OP_TEE_build_release_4_2_0]: https://github.com/OP-TEE/build/releases/tag/4.2.0
+[OP_TEE_build_commits_4_2_0]: https://github.com/OP-TEE/build/compare/4.1.0...4.2.0
+[OP_TEE_build_pr_4_2_0]: https://github.com/OP-TEE/build/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-01-19..2024-04-12
+
+[linaro_swg_optee_examples_release_4_2_0]: https://github.com/linaro-swg/optee_examples/releases/tag/4.2.0
+[linaro_swg_optee_examples_commits_4_2_0]: https://github.com/linaro-swg/optee_examples/compare/4.1.0...4.2.0
+[linaro_swg_optee_examples_pr_4_2_0]: https://github.com/linaro-swg/optee_examples/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-01-19..2024-04-12
+
 # OP-TEE - version 4.1.0 (2024-01-19)
 
 - Links to the release pages, commits and pull requests merged into this release for:

diff --git 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 ?= 4
-CFG_OPTEE_REVISION_MINOR ?= 1
+CFG_OPTEE_REVISION_MINOR ?= 2
 CFG_OPTEE_REVISION_EXTRA ?=
 
 # Trusted OS implementation version