From e243a60efea1393e9f888fb5839a681739322669 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 24 Jun 2021 11:30:32 +0200 Subject: [PATCH] security/intel/cbnt: Remove fixed size requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CBnT provisioning tooling in intel-sec-tools are now cbfs aware and don't need to have a fixed size at buildtime. Tested on OCP/Deltalake with CBnT enabled. Change-Id: I446b5045fe65f51c5fa011895cd56dbd25b6ccc7 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/55821 Reviewed-by: Angel Pons Reviewed-by: Christopher Meis Reviewed-by: Christian Walter Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/mainboard/ocp/deltalake/Kconfig | 7 ------- src/security/intel/cbnt/Kconfig | 1 - 2 files changed, 8 deletions(-) diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index b92bd96ebe..316149567e 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -58,11 +58,4 @@ config CONSOLE_POST bool default y -config C_ENV_BOOTBLOCK_SIZE - hex - default 0xc000 if FIXED_BOOTBLOCK_SIZE - help - This matches the IBB size used for CBnT. Adjust this to the - used CBnT settings. - endif # BOARD_OCP_DELTALAKE diff --git a/src/security/intel/cbnt/Kconfig b/src/security/intel/cbnt/Kconfig index d16e6852a6..c430123fcb 100644 --- a/src/security/intel/cbnt/Kconfig +++ b/src/security/intel/cbnt/Kconfig @@ -7,7 +7,6 @@ config INTEL_CBNT_SUPPORT #depends on PLATFORM_HAS_DRAM_CLEAR select INTEL_TXT # With CBnT the bootblock is set up as a CBnT IBB and needs a fixed size - select FIXED_BOOTBLOCK_SIZE select TPM_MEASURED_BOOT_INIT_BOOTBLOCK if TPM_MEASURED_BOOT help Enables Intel Converged Bootguard and Trusted Execution Technology