summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Almansa Sobrino <javier.almansasobrino@arm.com>2020-09-22 20:02:57 +0100
committerAlexei Fedorov <Alexei.Fedorov@arm.com>2020-09-23 11:26:51 +0000
commit6e3a159d0ac794535cab764fb55f3bed4c25d0fc (patch)
tree56ae3b77c3a4093313686c5098288ba6f0297177
parent98de503180dbf9afc51f3f7f864d1a3243507398 (diff)
downloadtf-a-ci-scripts-6e3a159d0ac794535cab764fb55f3bed4c25d0fc.tar.gz
Fix CI issues caused by Measured Boot+fTPM test patch
Change-Id: Ief0e529dbd9b80cfbfcb622e189b7173128be4a6 Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
-rw-r--r--group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0 (renamed from group/measured-boot-ftpm/fvp-mb-256:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0)0
-rw-r--r--tf_config/fvp-mb-2563
-rw-r--r--tf_config/fvp-mb-256-optee11
3 files changed, 11 insertions, 3 deletions
diff --git a/group/measured-boot-ftpm/fvp-mb-256:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0 b/group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
index 0a342ff29..0a342ff29 100644
--- a/group/measured-boot-ftpm/fvp-mb-256:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
+++ b/group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
diff --git a/tf_config/fvp-mb-256 b/tf_config/fvp-mb-256
index 615d41116..ad1a754dd 100644
--- a/tf_config/fvp-mb-256
+++ b/tf_config/fvp-mb-256
@@ -1,11 +1,8 @@
ARM_ROTPK_LOCATION=devel_rsa
-ARM_TSP_RAM_LOCATION=tdram
CROSS_COMPILE=aarch64-none-elf-
-EVENT_LOG_LEVEL=20
GENERATE_COT=1
MEASURED_BOOT=1
PLAT=fvp
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SPD=opteed
TPM_HASH_ALG=sha256
TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-mb-256-optee b/tf_config/fvp-mb-256-optee
new file mode 100644
index 000000000..615d41116
--- /dev/null
+++ b/tf_config/fvp-mb-256-optee
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+EVENT_LOG_LEVEL=20
+GENERATE_COT=1
+MEASURED_BOOT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=opteed
+TPM_HASH_ALG=sha256
+TRUSTED_BOARD_BOOT=1