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