[coreboot-gerrit] Change in coreboot[master]: arch/x86/bootblock.ld: Align the bottom of the bootblock to 64 bytes

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55046 )

Change subject: arch/x86/bootblock.ld: Align the bottom of the bootblock to 64 bytes
......................................................................

arch/x86/bootblock.ld: Align the bottom of the bootblock to 64 bytes

Align the bootblock size to 64 bytes because:
- cachelines are often 64 bytes large
- Bootguard/CBnT requires a 64 byte alignment
- It can reduce the bootblock footprint as the size is aligned upwards

Change-Id: I69cdacdd15bfca1b91b6f271f2ff76889969fd91
Signed-off-by: Arthur Heymans 
---
M src/arch/x86/bootblock.ld
M src/mainboard/ocp/deltalake/Kconfig
M src/security/intel/cbnt/Kconfig
3 files changed, 1 insertion(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/55046/1

diff --git a/src/arch/x86/bootblock.ld b/src/arch/x86/bootblock.ld
index 3cd0900..4ab2275 100644
--- a/src/arch/x86/bootblock.ld
+++ b/src/arch/x86/bootblock.ld
@@ -17,7 +17,7 @@
    . = _ebootblock - CONFIG_C_ENV_BOOTBLOCK_SIZE;
 #else
    . = BOOTBLOCK_TOP - PROGRAM_SZ;
-	. = ALIGN(16);
+	. = ALIGN(64);
 #endif

_bootblock = .;
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig
index b92bd96..3161495 100644
--- a/src/mainboard/ocp/deltalake/Kconfig
+++ b/src/mainboard/ocp/deltalake/Kconfig
@@ -58,11 +58,4 @@
    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 9d48490..5bc82fb 100644
--- a/src/security/intel/cbnt/Kconfig
+++ b/src/security/intel/cbnt/Kconfig
@@ -7,7 +7,6 @@
    #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