Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions fvp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@ TF_A_FLAGS ?= \
ifneq ($(MEASURED_BOOT),y)
TF_A_FLAGS += MEASURED_BOOT=0
else
TF_A_FLAGS += MBEDTLS_DIR=$(ROOT)/mbedtls \
ARM_ROTPK_LOCATION=devel_rsa \
TF_A_FLAGS += ARM_ROTPK_LOCATION=devel_rsa \
GENERATE_COT=1 \
MEASURED_BOOT=1 \
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem \
Expand Down Expand Up @@ -340,7 +339,7 @@ ifeq ($(SPMC_AT_EL),2)
FVP_ARGS += -C cluster0.gicv3.extended-interrupt-range-support=1 \
-C cluster0.has_generic_authentication=1 \
-C cluster0.has_pointer_authentication=2 \
-C cluster0.has_branch_target_exception=1 \
-C cluster0.bti_support_level=1 \

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might require bumping the model version if it exists in a CI.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the OP-TEE CI runs validation only in QEMU and the CI concern is not valid.

I think running tests on the AEM base FVP in the CI could be enabled now as it has became freely available from here. But this is out of scope for this change.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the OP-TEE CI runs validation only in QEMU and the CI concern is not valid.

Correct.

I think running tests on the AEM base FVP in the CI could be enabled now as it has became freely available from here. But this is out of scope for this change.

+1. That's interesting.

-C cluster0.has_arm_v8-4=1 \
-C cluster0.has_large_system_ext=1 \
-C cluster0.has_large_va=1 \
Expand All @@ -349,7 +348,7 @@ ifeq ($(SPMC_AT_EL),2)
-C cluster1.gicv3.extended-interrupt-range-support=1 \
-C cluster1.has_generic_authentication=1 \
-C cluster1.has_pointer_authentication=2 \
-C cluster1.has_branch_target_exception=1 \
-C cluster1.bti_support_level=1 \
-C cluster1.has_arm_v8-4=1 \
-C cluster1.has_large_system_ext=1 \
-C cluster1.has_large_va=1 \
Expand Down
9 changes: 9 additions & 0 deletions fvp/spmc_el2_optee_sp_manifest.dts
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,13 @@
device_type = "device-memory";
reg = <0x0 0x1c090000 0x0 0x40000>; /* UART */
};

#if MEASURED_BOOT
tpm_event_log {
compatible = "arm,tpm_event_log";
tpm_event_log_addr = <0x0 0x0>;
tpm_event_log_size = <0x0>;
tpm_event_log_max_size = <0x0>;
};
#endif
};