From cbce39005ede7e9f0feba6fa98bd7ebd0bb629cc Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 28 Jan 2021 18:25:58 +0100 Subject: drivers/security/cbnt: Fix bootblock size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic5ad9d29f247b6f828501bfacc27a8af08761d55 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/50082 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Zhang Reviewed-by: Patrick Rudolph Reviewed-by: Angel Pons Reviewed-by: Kyösti Mälkki --- src/mainboard/ocp/deltalake/Kconfig | 7 +++++++ src/security/intel/cbnt/Kconfig | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index bb907f1af7..c439dca4d0 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -57,4 +57,11 @@ 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 f13f6ec59c..e5830b7b40 100644 --- a/src/security/intel/cbnt/Kconfig +++ b/src/security/intel/cbnt/Kconfig @@ -6,6 +6,8 @@ config INTEL_CBNT_SUPPORT depends on CPU_INTEL_FIRMWARE_INTERFACE_TABLE #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 help Enables Intel Converged Bootguard and Trusted Execution Technology Support. This will enable one to add a Key Manifest (KM) and a Boot -- cgit v1.2.3