Skip to content
Snippets Groups Projects
Verified Commit 89a09a8b authored by Emekcan Aras's avatar Emekcan Aras Committed by Ali Ozaslan
Browse files

bsp: Remove boot order patch


Removes boot order patches since an equivalent patch merged upstream.

Signed-off-by: default avatarEmekcan Aras <Emekcan.Aras@arm.com>
parent 09f39a3c
No related branches found
No related tags found
2 merge requests!16Sync scarthgap and remove N1SDP support,!13Change rules for trigger and fix issues
Pipeline #9736 passed with warnings with stage
in 2 minutes and 29 seconds
From 9cb4babc2e496a4028bcd75337ea4466563f73ca Mon Sep 17 00:00:00 2001
From: Emekcan Aras <Emekcan.Aras@arm.com>
Date: Wed, 13 Mar 2024 16:44:10 +0000
Subject: [PATCH] add boot order into SP manifest
The block storage SP should be loaded before the protected storage and ITS
SP due to block storage dependency. After OP-TEE v4.0, SPs can be loaded
in orderly fashion depending on the boot-order property in the SPs
manifest file. This patch loads SPs in a orderly fashion to make sure
there is no runtime dependency issues.
Signed-off-by: Emekcan Aras <Emekcan.Aras@linaro.org>
Upstream-Status: Pending
---
.../config/default-opteesp/default_block-storage.dts.in | 1 +
deployments/crypto/config/default-opteesp/default_crypto.dts.in | 1 +
.../shared-flash-opteesp/default_internal-trusted-storage.dts.in | 1 +
.../config/shared-flash-opteesp/default_protected-storage.dts.in | 1 +
.../config/default-opteesp/default_smm-gateway.dts.in | 1 +
5 files changed, 5 insertions(+)
diff --git a/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in b/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
index 0a97cb5..4b408ca 100644
--- a/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
@@ -18,4 +18,5 @@
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;
+ boot-order = /bits/ 16 <1>;
};
diff --git a/deployments/crypto/config/default-opteesp/default_crypto.dts.in b/deployments/crypto/config/default-opteesp/default_crypto.dts.in
index c900636..7d90a88 100644
--- a/deployments/crypto/config/default-opteesp/default_crypto.dts.in
+++ b/deployments/crypto/config/default-opteesp/default_crypto.dts.in
@@ -18,6 +18,7 @@
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;
+ boot-order = /bits/ 16 <4>;
device-regions {
compatible = "arm,ffa-manifest-device-regions";
diff --git a/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
index 77d0805..a6ac644 100644
--- a/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
@@ -18,4 +18,5 @@
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;
+ boot-order = /bits/ 16 <3>;
};
diff --git a/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in b/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
index b305fbb..95bd537 100644
--- a/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
@@ -18,4 +18,5 @@
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;
+ boot-order = /bits/ 16 <2>;
};
diff --git a/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in b/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
index d74c2f3..4803de1 100644
--- a/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
+++ b/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
@@ -18,6 +18,7 @@
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;
+ boot-order = /bits/ 16 <5>;
memory-regions {
compatible = "arm,ffa-manifest-memory-regions";
--
2.25.1
FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/files/n1sdp:"
SRC_URI:append:n1sdp = " \
file://0001-add-boot-order-into-SP-manifest.patch \
"
# SPDX-FileCopyrightText: <text>Copyright 2024 Arm Limited and/or its
# affiliates <open-source-office@arm.com></text>
#
# SPDX-License-Identifier: MIT
require ts-platforms.inc
# SPDX-FileCopyrightText: <text>Copyright 2024 Arm Limited and/or its
# affiliates <open-source-office@arm.com></text>
#
# SPDX-License-Identifier: MIT
require ts-platforms.inc
# SPDX-FileCopyrightText: <text>Copyright 2024 Arm Limited and/or its
# affiliates <open-source-office@arm.com></text>
#
# SPDX-License-Identifier: MIT
require ts-platforms.inc
......@@ -3,7 +3,5 @@
#
# SPDX-License-Identifier: MIT
require ts-platforms.inc
# Override configuration to use block storage service
OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/internal-trusted-storage/config/shared-flash-${TS_ENV}"
......@@ -3,7 +3,5 @@
#
# SPDX-License-Identifier: MIT
require ts-platforms.inc
# Override configuration to use block storage service
OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/protected-storage/config/shared-flash-${TS_ENV}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment