Merge branch 'master' into poc-remote-attestation

OP-TEE · Feb 13, 2021 · 3b50b06 · 3b50b06
2 parents e86173a + 22367c1
commit 3b50b06
Show file tree

Hide file tree

Showing 177 changed files with 10,401 additions and 1,616 deletions.
diff --git a/.shippable.yml b/.shippable.yml
@@ -20,15 +20,15 @@ build:
     - function upload_cache() { if [ ! -e .uploaded ]; then echo Uploading cache && tar c -C /root .ccache | gzip -1 | ssh $SCP_OPT shippable@shippable-cache.forissier.org "cat >ccache-$PROJ.tar.gz" && touch .uploaded || echo Nevermind; fi; }
     - function check_upload_cache() { NOW=$(date +%s); if [ $(expr $NOW - $START) -gt 3000 ]; then upload_cache; fi; }
     - function _make() { make -j$(getconf _NPROCESSORS_ONLN) -s O=out $* && ccache -s && ccache -z && check_upload_cache; }
-    - function download_plug_and_trust() { curl -L https://github.com/foundriesio/plug-and-trust/releases/download/v0.0.1/se050-0.0.1.tar.bz2 | tar -jxvf - -C /root || (rm -rf /root/se050-0.0.1; echo Nervermind); }
+    - function download_plug_and_trust() { mkdir -p /root/se050 && curl -L https://github.com/foundriesio/plug-and-trust/releases/download/v0.0.2/se050-0.0.2.tar.bz2 | tar -jxvf - --strip-components=1 -C /root/se050 || (rm -rf /root/se050; echo Nervermind); }
 
     - download_cache
     - ccache -z
     - download_plug_and_trust
 
     - _make
     - _make COMPILER=clang
-    - _make CFG_TEE_CORE_LOG_LEVEL=4 CFG_TEE_CORE_DEBUG=y CFG_TEE_TA_LOG_LEVEL=4 CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y
+    - _make CFG_TEE_CORE_LOG_LEVEL=4 CFG_TEE_CORE_DEBUG=y CFG_TEE_TA_LOG_LEVEL=4 CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y CFG_ENABLE_EMBEDDED_TESTS=y
     - _make CFG_TEE_CORE_LOG_LEVEL=0 CFG_TEE_CORE_DEBUG=n CFG_TEE_TA_LOG_LEVEL=0 CFG_DEBUG_INFO=n
     - _make CFG_TEE_CORE_LOG_LEVEL=0
     - _make CFG_TEE_CORE_MALLOC_DEBUG=y CFG_CORE_DEBUG_CHECK_STACKS=y
@@ -45,8 +45,8 @@ build:
     - _make CFG_WITH_PAGER=y out/core/tee{,-pager,-pageable}.bin
     - _make CFG_WITH_PAGER=y CFG_CRYPTOLIB_NAME=mbedtls CFG_CRYPTOLIB_DIR=lib/libmbedtls
     - _make CFG_WITH_PAGER=y CFG_WITH_LPAE=y
-    - _make CFG_WITH_LPAE=y CFG_CORE_ASLR=y
-    - _make CFG_RPMB_FS=y CFG_CORE_ASLR=y
+    - _make CFG_WITH_LPAE=y
+    - _make CFG_RPMB_FS=y
     - _make CFG_RPMB_FS=y CFG_RPMB_TESTKEY=y
     - _make CFG_REE_FS=n CFG_RPMB_FS=y
     - _make CFG_WITH_PAGER=y CFG_WITH_LPAE=y CFG_RPMB_FS=y CFG_DT=y CFG_TEE_CORE_LOG_LEVEL=1 CFG_TEE_CORE_DEBUG=y CFG_CC_OPT_LEVEL=0 CFG_DEBUG_INFO=y
@@ -56,7 +56,7 @@ build:
     - _make CFG_TA_GPROF_SUPPORT=y CFG_FTRACE_SUPPORT=y CFG_SYSCALL_FTRACE=y CFG_ULIBS_MCOUNT=y
     - _make CFG_SECURE_DATA_PATH=y
     - _make CFG_REE_FS_TA_BUFFERED=y
-    - _make PLATFORM=vexpress-qemu_armv8a CFG_CORE_ASLR=y
+    - _make PLATFORM=vexpress-qemu_armv8a
     - _make PLATFORM=vexpress-qemu_armv8a COMPILER=clang
     - _make PLATFORM=vexpress-qemu_armv8a CFG_WITH_PAGER=y
     - _make PLATFORM=vexpress-qemu_armv8a CFG_FTRACE_SUPPORT=y CFG_ULIBS_MCOUNT=y CFG_ULIBS_SHARED=y
@@ -78,36 +78,36 @@ build:
     - _make PLATFORM=mediatek-mt8183
     - _make PLATFORM=mediatek-mt8516
     - _make PLATFORM=imx-mx6ulevk
-    - _make PLATFORM=imx-mx6ulevk CFG_NXP_CAAM=y
+    - _make PLATFORM=imx-mx6ulevk CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
     - _make PLATFORM=imx-mx6ul9x9evk
     - _make PLATFORM=imx-mx6ullevk
-    - if [ -d /root/se050-0.0.1 ]; then _make PLATFORM=imx-mx6ullevk CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_THREAD_EXTRA=8192 CFG_STACK_TMP_EXTRA=8192 CFG_CRYPTO_DRV_CIPHER=y CFG_CRYPTO_DRV_ACIPHER=y CFG_NXP_SE05X_RNG_DRV=y CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_RSA_DRV=y CFG_NXP_SE05X_ECC_DRV=y CFG_NXP_SE05X_CTR_DRV=y CFG_NXP_SE05X_PLUG_AND_TRUST_LIB=/root/se050-0.0.1/buildarm/libse050.a CFG_NXP_SE05X_PLUG_AND_TRUST=/root/se050-0.0.1 ; fi
+    - if [ -d /root/se050 ]; then _make PLATFORM=imx-mx6ullevk CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_{THREAD,TMP}_EXTRA=8192 CFG_CRYPTO_DRV_{CIPHER,ACIPHER}=y CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_{RNG,RSA,ECC,CTR}_DRV=y CFG_NXP_SE05X_PLUG_AND_TRUST_LIB=/root/se050/buildarm/libse050.a CFG_NXP_SE05X_PLUG_AND_TRUST=/root/se050; fi
     - _make PLATFORM=imx-mx6ulzevk
     - _make PLATFORM=imx-mx6slevk
     - _make PLATFORM=imx-mx6sllevk
     - _make PLATFORM=imx-mx6sxsabreauto
     - _make PLATFORM=imx-mx6sxsabresd
-    - _make PLATFORM=imx-mx6sxsabresd CFG_NXP_CAAM=y
+    - _make PLATFORM=imx-mx6sxsabresd CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
     - _make PLATFORM=imx-mx6solosabresd
     - _make PLATFORM=imx-mx6solosabreauto
     - _make PLATFORM=imx-mx6sxsabreauto
     - _make PLATFORM=imx-mx6qsabrelite
     - _make PLATFORM=imx-mx6qsabresd
     - _make PLATFORM=imx-mx6qsabresd CFG_RPMB_FS=y
     - _make PLATFORM=imx-mx6qsabreauto
-    - _make PLATFORM=imx-mx6qsabreauto CFG_NXP_CAAM=y
+    - _make PLATFORM=imx-mx6qsabreauto CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
     - _make PLATFORM=imx-mx6qpsabreauto
     - _make PLATFORM=imx-mx6qpsabresd
     - _make PLATFORM=imx-mx6dlsabresd
     - _make PLATFORM=imx-mx6dlsabreauto
     - _make PLATFORM=imx-mx6dapalis
     - _make PLATFORM=imx-mx6qapalis
     - _make PLATFORM=imx-mx7dsabresd
-    - _make PLATFORM=imx-mx7dsabresd CFG_NXP_CAAM=y
+    - _make PLATFORM=imx-mx7dsabresd CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
     - _make PLATFORM=imx-mx7ulpevk
     - _make PLATFORM=imx-mx8mmevk
-    - _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y
-    - if [ -d /root/se050-0.0.1 ]; then _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=n CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_THREAD_EXTRA=8192 CFG_STACK_TMP_EXTRA=8192 CFG_CRYPTO_DRV_CIPHER=y CFG_CRYPTO_DRV_ACIPHER=y CFG_NXP_SE05X_RNG_DRV=y CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_RSA_DRV=y CFG_NXP_SE05X_ECC_DRV=y CFG_NXP_SE05X_CTR_DRV=y CFG_NXP_SE05X_PLUG_AND_TRUST_LIB=/root/se050-0.0.1/build/libse050.a CFG_NXP_SE05X_PLUG_AND_TRUST=/root/se050-0.0.1 ; fi
+    - _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
+    - if [ -d /root/se050 ]; then _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y CFG_NXP_CAAM_RNG_DRV=y CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_{THREAD,TMP}_EXTRA=8192 CFG_CRYPTO_DRV_{CIPHER,ACIPHER}=y CFG_NXP_SE05X_RNG_DRV=n CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_{RSA,ECC,CTR}_DRV=y CFG_NXP_SE05X_PLUG_AND_TRUST_LIB=/root/se050/build/libse050.a CFG_NXP_SE05X_PLUG_AND_TRUST=/root/se050 ; fi
     - _make PLATFORM=imx-mx8mnevk
     - _make PLATFORM=imx-mx8mqevk
     - _make PLATFORM=imx-mx8qxpmek
@@ -131,6 +131,7 @@ build:
     - _make PLATFORM=ls-ls1088ardb
     - _make PLATFORM=ls-ls2088ardb
     - _make PLATFORM=ls-lx2160ardb
+    - _make PLATFORM=ls-lx2160aqds
     - _make PLATFORM=zynq7k-zc702
     - _make PLATFORM=zynqmp-zcu102
     - _make PLATFORM=zynqmp-zcu102 CFG_ARM64_core=y

diff --git 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/MAINTAINERS b/MAINTAINERS
@@ -120,7 +120,7 @@ MediaTek MT8173 EVB
 S:	Orphan
 F:	core/arch/arm/plat-mediatek/
 
-NXP LS1021A, LS1043A-RDB, LS1046A-RDB, LS1012A-RDB, LS1012A-FRWY, LS1028A-RDB, LS1088A-RDB, LS2088A-RDB, LX2160A-RDB
+NXP LS1021A, LS1043A-RDB, LS1046A-RDB, LS1012A-RDB, LS1012A-FRWY, LS1028A-RDB, LS1088A-RDB, LS2088A-RDB, LX2160A-RDB, LX2160A-QDS
 R:	Pankaj Gupta <pankaj.gupta@nxp.com> [@pangupta]
 R:	Sahil Malhotra <sahil.malhotra@nxp.com> [@sahilnxp]
 R:	[@OP-TEE/plat-ls]