From f2447d1cd7a6b870398c27f1914be6a12b4b1f31 Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Wed, 11 Dec 2024 15:02:29 +0100 Subject: [PATCH] Revert "qemu_v8.mk: enable MEASURED_BOOT_FTPM by default" This reverts commit 9bf2bbe57184bb2c6ba73eacb2b11b7eeee40962. CI has become quite unstable since that commit was merged, see for instance the multiple failures in [1] and the absence of failure in [2]. I do not see any direct relationship betweem fTPM and the errors reported in the CI runs, but in order to make CI useful again we need to have it run reliably so disable MEASURED_BOOT_FTPM temporarily. Link: [1] https://github.com/OP-TEE/optee_os/pull/7170 Link: [2] https://github.com/OP-TEE/optee_os/pull/7175 Signed-off-by: Jerome Forissier --- qemu_v8.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/qemu_v8.mk b/qemu_v8.mk index 4a41f27f..edc1cce2 100644 --- a/qemu_v8.mk +++ b/qemu_v8.mk @@ -35,9 +35,6 @@ ifeq ($(shell uname -m),x86_64) RUST_ENABLE ?= y endif -# Enable fTPM -MEASURED_BOOT_FTPM ?= y - include common.mk DEBUG ?= 1