| commit | 5074876a05512dd01c7a404f2dc936c0a5c5993b | [log] [tgz] |
|---|---|---|
| author | Javier Almansa Sobrino <javier.almansasobrino@arm.com> | Thu Sep 24 13:22:48 2020 +0100 |
| committer | Alexei Fedorov <Alexei.Fedorov@arm.com> | Wed Oct 07 16:13:36 2020 +0000 |
| tree | 8fadef70b0222d4e04f19907b2c365e50ccd4141 | |
| parent | dd655272d6d115f31b38b8b32dca405722d2da9f [diff] |
Enable use of ROMLIB for Measured Boot+fTPM tests to avoid memory issues. Change-Id: Iffcd6c7d74377a015e65ebe2b1272276afeb333c Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
diff --git a/group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0 b/group/tf-l1-boot-tests-misc/fvp-mb-256-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a similarity index 100% rename from group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0 rename to group/tf-l1-boot-tests-misc/fvp-mb-256-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
diff --git a/run_config/fvp-linux.rootfs+ftpm b/run_config/fvp-linux.rootfs+ftpm index bc8fa4b..cbf8213 100644 --- a/run_config/fvp-linux.rootfs+ftpm +++ b/run_config/fvp-linux.rootfs+ftpm
@@ -13,8 +13,8 @@ archive_file "edk2.bin" # Configure the uarts for tracking. - uart="0" timeout="300" file="linux-tpm.exp" track_expect - uart="1" timeout="300" file="tpm-logs.exp" track_expect + uart="0" timeout="600" file="linux-tpm.exp" track_expect + uart="1" timeout="600" file="tpm-logs.exp" track_expect set_run_env "ports_script" "$ci_root/model/ftpm-ports.awk" set_run_env "num_uarts" "2" }
diff --git a/tf_config/fvp-mb-256-optee b/tf_config/fvp-mb-256-optee-romlib similarity index 95% rename from tf_config/fvp-mb-256-optee rename to tf_config/fvp-mb-256-optee-romlib index 615d411..acf07c0 100644 --- a/tf_config/fvp-mb-256-optee +++ b/tf_config/fvp-mb-256-optee-romlib
@@ -9,3 +9,4 @@ SPD=opteed TPM_HASH_ALG=sha256 TRUSTED_BOARD_BOOT=1 +USE_ROMLIB=1 \ No newline at end of file