Skip to content

Commit 4a6be8f

Browse files
ItsNayabSDConchuOD
authored andcommitted
configs: bump optee os to version 4.2.0
Unlike bumping the optee os to a latest release tag, this commit updates optee os to specific commit id. This updates optee os from v4.0.0 to v4.2.0 and also include the performance improvements from latest source tree. A patch has been added to disable HUK feature which prevents xtest regression test failures. Signed-off-by: Nayab Sayed <[email protected]> Reviewed-by: Dharma Balasubiramani <[email protected]> Signed-off-by: Conor Dooley <[email protected]>
1 parent b256d51 commit 4a6be8f

3 files changed

+26
-2
lines changed

configs/sama5d27_som1_ek_optee_graphics_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_ek-opteesd_uboot"
256256
BR2_TARGET_OPTEE_OS=y
257257
BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
258258
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/OP-TEE/optee_os.git"
259-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="4.0.0"
259+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="16fbd46d245d634778b9df729e3909d6bfd9a79b"
260260
BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
261261
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
262262
BR2_TARGET_OPTEE_OS_PLATFORM="sam"

configs/sama5d27_som1_ek_optee_headless_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ BR2_TARGET_OPTEE_OS=y
165165
BR2_PACKAGE_OPTEE_EXAMPLES=y
166166
BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
167167
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/OP-TEE/optee_os.git"
168-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="4.0.0"
168+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="16fbd46d245d634778b9df729e3909d6bfd9a79b"
169169
BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
170170
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
171171
BR2_TARGET_OPTEE_OS_PLATFORM="sam"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 6edb3bb485f7104353eb31754447f4404995b723 Mon Sep 17 00:00:00 2001
2+
From: Nayab Sayed <[email protected]>
3+
Date: Tue, 7 May 2024 15:17:27 +0530
4+
Subject: [PATCH] package/optee-os: disable NVMEM HUK
5+
6+
Signed-off-by: Nayab Sayed <[email protected]>
7+
---
8+
core/arch/arm/plat-sam/conf.mk | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/core/arch/arm/plat-sam/conf.mk b/core/arch/arm/plat-sam/conf.mk
12+
index 761fba9..c37e598 100644
13+
--- a/core/arch/arm/plat-sam/conf.mk
14+
+++ b/core/arch/arm/plat-sam/conf.mk
15+
@@ -133,5 +133,5 @@ CFG_NVMEM_HUK ?= n
16+
else
17+
CFG_ATMEL_SFC ?= y
18+
CFG_NVMEM_DIE_ID ?= y
19+
-CFG_NVMEM_HUK ?= y
20+
+# CFG_NVMEM_HUK ?= y
21+
endif
22+
--
23+
2.43.2
24+

0 commit comments

Comments
 (0)