Add block_storage SP to reference TS build configuration
Adds the block_storage SP to the set of TS secure partitions
included in the reference build configuration. To reduce the
memory impact of adding an additional SP, the load addresses of
SPs have been adjusted to reduce the unecessarily large amount
of secure memory assigned to each SP. Because of its larger
memory footprint, the Crypto SP memory is left unmodified.
To enable multiple build configurations to coexist for SP deployments
defined in the Trusted Services project, the directory structure has
been modified to allow for any number of different configurations.
This change modifies the reference OP-TEE build for compatibility
with the TS changes.
Signed-off-by: Julian Hall <julian.hall@arm.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/fvp/spmc_manifest.dts b/fvp/spmc_manifest.dts
index 1346c39..e046fa5 100644
--- a/fvp/spmc_manifest.dts
+++ b/fvp/spmc_manifest.dts
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause */
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
*/
/dts-v1/;
@@ -37,9 +37,14 @@
#ifdef ARM_BL2_SP_LIST_DTS
sp_packages {
compatible = "arm,sp_pkg";
+ block_storage {
+ uuid = <0x806e6463 0x2f4652eb 0xdf8c4fac 0x9c518739>;
+ load-address = <0x0 0x7a00000>;
+ };
+
internal_trusted_storage {
uuid = <0x48ef1edc 0xcf4c7ab1 0xcfdf8bac 0x141b71f7>;
- load-address = <0x0 0x7a00000>;
+ load-address = <0x0 0x7a80000>;
};
protected_storage_sp {
@@ -49,19 +54,19 @@
crypto_sp {
uuid = <0xd552dfd9 0xb24ba216 0x6dd2a49a 0xc0e8843b>;
- load-address = <0x0 0x7c00000>;
+ load-address = <0x0 0x7b80000>;
};
#if MEASURED_BOOT
initial_attestation_sp {
uuid = <0x55f1baa1 0x95467688 0x95547c8f 0x74b98d5e>;
- load-address = <0x0 0x7d00000>;
+ load-address = <0x0 0x7c80000>;
};
#endif
smm_gateway {
uuid = <0x33d532ed 0x0942e699 0x722dc09c 0xa798d9cd>;
- load-address = <0x0 0x7e00000>;
+ load-address = <0x0 0x7d00000>;
};
};
#endif