| Message ID | 20231114122339.185182-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm-bsp/optee-os: update Upstream-Status tags | expand |
diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0001-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0001-Handle-logging-syscall.patch index 9c1d7816..58ba2afd 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0001-Handle-logging-syscall.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0001-Handle-logging-syscall.patch @@ -4,7 +4,7 @@ Date: Thu, 31 Aug 2023 10:51:54 +0100 Subject: [PATCH] Handle logging syscall Signed-off-by: Emekcan Aras <emekcan.aras@arm.com> -Upstream-Status: Inappropriate [Other] +Upstream-Status: Pending [upstreamed differently in 280b6a3] --- core/arch/arm/kernel/spmc_sp_handler.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch index 9d305adc..0955d99f 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending [Not submitted to upstream yet] +Upstream-Status: Pending [upstreamed differently in 280b6a3] Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 2001 diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch b/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch index 381cad9a..e6fe7168 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch +++ b/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch @@ -20,10 +20,11 @@ change in TF-A ("feat(qemu): update abi between spmd and spmc") [2]. file. Used by Trusted OS (BL32), that is, OP-TEE in this case Link: [2] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=25ae7ad1878244f78206cc7c91f7bdbd267331a1 -Upstream-Status: Accepted - Acked-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> + +Upstream-Status: Backport [f1f431c7a92671b4fa397976d381cc5ad8adacc4] +Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com> --- core/arch/arm/kernel/boot.c | 8 +++++++- core/arch/arm/kernel/entry_a64.S | 17 ++++++++--------- diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch b/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch index 5421b10e..da0422b9 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch +++ b/meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch @@ -9,10 +9,11 @@ This commit adds functionality to save the TOS_FW_CONFIG too, so we can retrieve it later. This is necessary for the CFG_CORE_SEL1_SPMC use case, because the SPMC manifest is passed in this DT. -Upstream-Status: Accepted - Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> + +Upstream-Status: Backport [809fa817ae6331d98b55f7afaa3c20f8407822e4] +Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com> --- core/arch/arm/kernel/boot.c | 60 ++++++++++++++++++++++- core/arch/arm/kernel/entry_a32.S | 3 +-