Revert "test: increase FVP Trusted SRAM where necessary"
This reverts commit f596ea3a5fa0ff77670b2c028eef95cbf69086f6.
Reason for revert: Yet Open-CI does not support the SRAM with 512Kb so first let's upload latest FVP models in Open-CI infra and then restore this patch.
Change-Id: I09c47beef1aa17e021bccf3a7df7aec8efb41be8
diff --git a/tf_config/fvp-bl2-el3 b/tf_config/fvp-bl2-el3
index 268d4f8..79f2539 100644
--- a/tf_config/fvp-bl2-el3
+++ b/tf_config/fvp-bl2-el3
@@ -1,4 +1,3 @@
RESET_TO_BL2=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 c476874..d838a3d 100644
--- a/tf_config/fvp-bl2-el3-pie
+++ b/tf_config/fvp-bl2-el3-pie
@@ -2,4 +2,3 @@
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 6abce14..2fcb7c2 100644
--- a/tf_config/fvp-drtm-romlib
+++ b/tf_config/fvp-drtm-romlib
@@ -2,4 +2,3 @@
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 bee8f77..2683091 100644
--- a/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
+++ b/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
@@ -8,4 +8,3 @@
HW_ASSISTED_COHERENCY=1
PLAT=fvp
USE_COHERENT_MEM=0
-FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-errata-abi-a710 b/tf_config/fvp-errata-abi-a710
index 7249907..15d9e41 100644
--- a/tf_config/fvp-errata-abi-a710
+++ b/tf_config/fvp-errata-abi-a710
@@ -13,4 +13,3 @@
HW_ASSISTED_COHERENCY=1
PLAT=fvp
USE_COHERENT_MEM=0
-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 d8cfbe8..0ada492 100644
--- a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
@@ -8,4 +8,3 @@
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-tbb-mbedtls-tsp-async-irq2el3-no-cohmem b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem
index 064d1b1..2305555 100644
--- a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem
@@ -9,4 +9,3 @@
TSP_INIT_ASYNC=1
TSP_NS_INTR_ASYNC_PREEMPT=1
USE_COHERENT_MEM=0
-FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-mbedtls b/tf_config/fvp-tspd-tbb-mbedtls
index 7d31d43..1544594 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls
+++ b/tf_config/fvp-tspd-tbb-mbedtls
@@ -5,4 +5,3 @@
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 ede1b48..0cd52a5 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-dualroot
+++ b/tf_config/fvp-tspd-tbb-mbedtls-dualroot
@@ -6,4 +6,3 @@
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 50f274f..2ed6144 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
+++ b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
@@ -9,4 +9,3 @@
SPD=tspd
TF_MBEDTLS_KEY_ALG=rsa+ecdsa
TRUSTED_BOARD_BOOT=1
-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 cac4248..32d173a 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert
+++ b/tf_config/fvp-tspd-tbb-mbedtls-rsa-4k-cert
@@ -6,4 +6,3 @@
SPD=tspd
TRUSTED_BOARD_BOOT=1
KEY_SIZE=4096
-FVP_TRUSTED_SRAM_SIZE=384