mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-07-15 15:37:15 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/optee-os: corstone1000: Update optee-os v3.22

Browse Source 
Updates optee-os and aligns with changes in v3.22 for Corstone-1000.

Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Emekcan Aras
2023-08-24 14:30:32 +01:00
committed by Jon Mason
parent 42170c1be4
commit 41cec3e053
6 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/include/corstone1000.inc
+2 -2
View File
@@ -36,8 +36,8 @@ UBOOT_ARCH = "arm"
UBOOT_EXTLINUX = "0"
#optee
PREFERRED_VERSION_optee-os ?= "3.20.%"
PREFERRED_VERSION_optee-client ?= "3.18.%"
PREFERRED_VERSION_optee-os ?= "3.22%"
PREFERRED_VERSION_optee-client ?= "3.22%"
EXTRA_IMAGEDEPENDS += "optee-os"
OPTEE_ARCH = "arm64"
OPTEE_BINARY = "tee-pager_v2.bin"
meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc
-6
View File
@@ -1,9 +1,3 @@
SRC_URI:remove = " \
file://0003-core-link-add-no-warn-rwx-segments.patch \
file://0007-core-spmc-handle-non-secure-interrupts.patch \
file://0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch \
"
COMPATIBLE_MACHINE = "corstone1000"
OPTEEMACHINE = "corstone1000"
meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend
-1
View File
@@ -1,7 +1,6 @@
# Machine specific configurations
MACHINE_OPTEE_OS_REQUIRE ?= ""
MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc"
MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
require ${MACHINE_OPTEE_OS_REQUIRE}
meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bbappend
+6
View File
@@ -0,0 +1,6 @@
# Machine specific configurations
MACHINE_OPTEE_OS_REQUIRE ?= ""
MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc"
require ${MACHINE_OPTEE_OS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/corstone1000/0008-plat-corstone1000-change-ns-interrupt-action.patch
+31
View File
@@ -0,0 +1,31 @@
From 7f51fa5f848b77b5aadfc553e1aeca52f4bcc5a1 Mon Sep 17 00:00:00 2001
From: Emekcan Aras <emekcan.aras@arm.com>
Date: Tue, 22 Aug 2023 17:18:26 +0100
Subject: [PATCH] platform: corstone1000: change ns-interrupt-action
Changes ns-interrupt-action for corstone1000. The interrupts are queued as
in the previous optee release. Currently, enabling preemption (settig this field
to 2) will halt psa-test from linux-userspace in corstone1000.
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Upstream-Status: Pending [Not submitted to upstream yet]
---
.../config/corstone1000-opteesp/default_se-proxy.dts.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in b/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
index cc42929d..839f7464 100644
--- a/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
@@ -16,7 +16,7 @@
execution-state = <0>; /* AArch64 */
xlat-granule = <0>; /* 4KiB */
messaging-method = <3>; /* Direct messaging only */
- ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
+ ns-interrupts-action = <0>; /* Non-secure interrupts are signaled */
elf-format = <1>;
device-regions {
--
2.17.1
meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
+1
View File
@@ -9,6 +9,7 @@ SRC_URI:append:corstone1000 = " \
file://0005-plat-corstone1000-add-compile-definitions-for-ECP_DP.patch;patchdir=../trusted-services \
file://0006-plat-corstone1000-Use-the-stateless-platform-service.patch;patchdir=../trusted-services \
file://0007-plat-corstone1000-Initialize-capsule-update-provider.patch;patchdir=../trusted-services \
file://0008-plat-corstone1000-change-ns-interrupt-action.patch;patchdir=../trusted-services \
"