From 6b61f61e6e209192ebf0b9a413744f7daaab06e8 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 19 Feb 2024 13:18:51 -0500 Subject: [PATCH] boards aimed to bump at coreboot 4.22.01: switch TPM event log format to TCG Signed-off-by: Thierry Laurion --- config/coreboot-p8z77-m_pro-tpm1.config | 4 ++-- config/coreboot-qemu-tpm1.config | 4 ++-- config/coreboot-t420-maximized.config | 4 ++-- config/coreboot-t420.config | 4 ++-- config/coreboot-t430-legacy.config | 4 ++-- config/coreboot-t430-maximized.config | 4 ++-- config/coreboot-t440p.config | 4 ++-- config/coreboot-t530-dgpu-maximized.config | 4 ++-- config/coreboot-t530-maximized.config | 4 ++-- config/coreboot-w530-dgpu-K1000m-maximized.config | 4 ++-- config/coreboot-w530-dgpu-K2000m-maximized.config | 4 ++-- config/coreboot-w530-maximized.config | 4 ++-- config/coreboot-w541.config | 4 ++-- config/coreboot-x220-maximized.config | 4 ++-- config/coreboot-x220.config | 4 ++-- config/coreboot-x230-legacy-flash.config | 4 ++-- config/coreboot-x230-legacy.config | 4 ++-- config/coreboot-x230-maximized-fhd_edp.config | 4 ++-- config/coreboot-x230-maximized.config | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/config/coreboot-p8z77-m_pro-tpm1.config b/config/coreboot-p8z77-m_pro-tpm1.config index 4731c9ef8..51f30a3e6 100644 --- a/config/coreboot-p8z77-m_pro-tpm1.config +++ b/config/coreboot-p8z77-m_pro-tpm1.config @@ -519,8 +519,8 @@ CONFIG_TPM=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-qemu-tpm1.config b/config/coreboot-qemu-tpm1.config index 5732a181e..214ff7f2a 100644 --- a/config/coreboot-qemu-tpm1.config +++ b/config/coreboot-qemu-tpm1.config @@ -415,8 +415,8 @@ CONFIG_TPM=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config index 5d9c7bf5a..63f061ef3 100644 --- a/config/coreboot-t420-maximized.config +++ b/config/coreboot-t420-maximized.config @@ -537,8 +537,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config index 1dcc32e1c..05d9e4c5c 100644 --- a/config/coreboot-t420.config +++ b/config/coreboot-t420.config @@ -536,8 +536,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t430-legacy.config b/config/coreboot-t430-legacy.config index 6cac07109..03c569622 100644 --- a/config/coreboot-t430-legacy.config +++ b/config/coreboot-t430-legacy.config @@ -524,8 +524,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config index faa9a49b7..108076214 100644 --- a/config/coreboot-t430-maximized.config +++ b/config/coreboot-t430-maximized.config @@ -537,8 +537,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config index 8b569337f..702701e7c 100644 --- a/config/coreboot-t440p.config +++ b/config/coreboot-t440p.config @@ -530,8 +530,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config index eccd79a03..5b967a7f7 100644 --- a/config/coreboot-t530-dgpu-maximized.config +++ b/config/coreboot-t530-dgpu-maximized.config @@ -572,8 +572,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config index f8f1a355d..095b847e6 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -539,8 +539,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config index 837694cb8..604e8a84f 100644 --- a/config/coreboot-w530-dgpu-K1000m-maximized.config +++ b/config/coreboot-w530-dgpu-K1000m-maximized.config @@ -573,8 +573,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config index e49ad2ee9..34621f8d4 100644 --- a/config/coreboot-w530-dgpu-K2000m-maximized.config +++ b/config/coreboot-w530-dgpu-K2000m-maximized.config @@ -573,8 +573,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config index c0322dbef..1780e2e91 100644 --- a/config/coreboot-w530-maximized.config +++ b/config/coreboot-w530-maximized.config @@ -540,8 +540,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-w541.config b/config/coreboot-w541.config index fe84f97ed..d40ccd68f 100644 --- a/config/coreboot-w541.config +++ b/config/coreboot-w541.config @@ -529,8 +529,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config index 8527c866c..4434611d0 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -536,8 +536,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x220.config b/config/coreboot-x220.config index 8527c866c..4434611d0 100644 --- a/config/coreboot-x220.config +++ b/config/coreboot-x220.config @@ -536,8 +536,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x230-legacy-flash.config b/config/coreboot-x230-legacy-flash.config index 53207fc8f..89afa4a74 100644 --- a/config/coreboot-x230-legacy-flash.config +++ b/config/coreboot-x230-legacy-flash.config @@ -522,8 +522,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x230-legacy.config b/config/coreboot-x230-legacy.config index 569fc1584..d0e9ab0bc 100644 --- a/config/coreboot-x230-legacy.config +++ b/config/coreboot-x230-legacy.config @@ -522,8 +522,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config index e91f9ea76..d17f7962a 100644 --- a/config/coreboot-x230-maximized-fhd_edp.config +++ b/config/coreboot-x230-maximized-fhd_edp.config @@ -535,8 +535,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1 diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config index edffda538..16e396c04 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -533,8 +533,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set # CONFIG_TPM_RDRESP_NEED_DELAY is not set -CONFIG_TPM_LOG_CB=y -# CONFIG_TPM_LOG_TPM1 is not set +# CONFIG_TPM_LOG_CB is not set +CONFIG_TPM_LOG_TPM1=y CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" CONFIG_PCR_BOOT_MODE=1 CONFIG_PCR_HWID=1