test: increase FVP Trusted SRAM where necessary
The TF-A configurations used by some tests require a larger Trusted SRAM
than the 256KB default. This increases the Trusted SRAM of these tests
to 384KB.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: If9a09d32472d8db78bd375da343a8feca6f82044
(cherry picked from commit 56d0ff12c2225e8c82b890b20a1b449fc05f3c7e)
diff --git a/tf_config/fvp-bl2-el3 b/tf_config/fvp-bl2-el3
index 011094b..dfe2995 100644
--- a/tf_config/fvp-bl2-el3
+++ b/tf_config/fvp-bl2-el3
@@ -1,3 +1,4 @@
BL2_AT_EL3=1
CROSS_COMPILE=aarch64-none-elf-
PLAT=fvp
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-bl2-el3-pie b/tf_config/fvp-bl2-el3-pie
index 793c8f4..6a115ec 100644
--- a/tf_config/fvp-bl2-el3-pie
+++ b/tf_config/fvp-bl2-el3-pie
@@ -2,3 +2,4 @@
CROSS_COMPILE=aarch64-none-elf-
PLAT=fvp
ENABLE_PIE=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-drtm-romlib b/tf_config/fvp-drtm-romlib
index 2fcb7c2..6abce14 100644
--- a/tf_config/fvp-drtm-romlib
+++ b/tf_config/fvp-drtm-romlib
@@ -2,3 +2,4 @@
DRTM_SUPPORT=1
PLAT=fvp
USE_ROMLIB=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t b/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
index 2683091..16d5da1 100644
--- a/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
+++ b/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
@@ -5,6 +5,7 @@
FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-dynamiq-2t.dts
FVP_MAX_CPUS_PER_CLUSTER=1
FVP_MAX_PE_PER_CPU=2
+FVP_TRUSTED_SRAM_SIZE=384
HW_ASSISTED_COHERENCY=1
PLAT=fvp
USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-errata-abi-a710 b/tf_config/fvp-errata-abi-a710
index 7f5bd4d..ff78746 100644
--- a/tf_config/fvp-errata-abi-a710
+++ b/tf_config/fvp-errata-abi-a710
@@ -20,6 +20,7 @@
ERRATA_A710_2768515=1
ERRATA_A710_2778471=1
ERRATA_NON_ARM_INTERCONNECT=1
+FVP_TRUSTED_SRAM_SIZE=384
HW_ASSISTED_COHERENCY=1
PLAT=fvp
USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-spm-measured-boot b/tf_config/fvp-spm-measured-boot
index fb6c81e..5336a8f 100644
--- a/tf_config/fvp-spm-measured-boot
+++ b/tf_config/fvp-spm-measured-boot
@@ -10,3 +10,4 @@
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
MEASURED_BOOT=1
USE_ROMLIB=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3 b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
index 0ada492..d8cfbe8 100644
--- a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
@@ -8,3 +8,4 @@
TRUSTED_BOARD_BOOT=1
TSP_INIT_ASYNC=1
TSP_NS_INTR_ASYNC_PREEMPT=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-mbedtls b/tf_config/fvp-tspd-tbb-mbedtls
index 1544594..7d31d43 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls
+++ b/tf_config/fvp-tspd-tbb-mbedtls
@@ -5,3 +5,4 @@
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
SPD=tspd
TRUSTED_BOARD_BOOT=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-dualroot b/tf_config/fvp-tspd-tbb-mbedtls-dualroot
index 0cd52a5..ede1b48 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-dualroot
+++ b/tf_config/fvp-tspd-tbb-mbedtls-dualroot
@@ -6,3 +6,4 @@
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
SPD=tspd
TRUSTED_BOARD_BOOT=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
index 9015344..0da2312 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
+++ b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
@@ -10,3 +10,4 @@
TF_MBEDTLS_KEY_ALG=rsa+ecdsa
TRUSTED_BOARD_BOOT=1
DEBUG=0
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert b/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert
index 32d173a..cac4248 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert
+++ b/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert
@@ -6,3 +6,4 @@
SPD=tspd
TRUSTED_BOARD_BOOT=1
KEY_SIZE=4096
+FVP_TRUSTED_SRAM_SIZE=384