Attention is currently required from: Patrick Rudolph. Christopher Meis has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55513 )
Change subject: intel/fit - Prepare for BootGuard support ......................................................................
intel/fit - Prepare for BootGuard support
src/cpu/intel/fit - For BootGuard use cbfs-position instead of align This is required for the strict positioning rules of BootGuard and circumvent cbfstool to place it somewhere uncontrollable or invalid for BootGuard
Change-Id: If78cc3ea77309abd96a9365f718d99f264381928 Signed-off-by: Christopher Meis christopher.meis@9elements.com --- M src/cpu/intel/fit/Kconfig M src/cpu/intel/fit/Makefile.inc 2 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/55513/1
diff --git a/src/cpu/intel/fit/Kconfig b/src/cpu/intel/fit/Kconfig index 9ea867e..554fbc0 100644 --- a/src/cpu/intel/fit/Kconfig +++ b/src/cpu/intel/fit/Kconfig @@ -5,7 +5,7 @@
config CPU_INTEL_NUM_FIT_ENTRIES int - default 16 if INTEL_TXT || INTEL_CBNT_SUPPORT + default 16 if INTEL_TXT || INTEL_CBNT_SUPPORT || INTEL_BG_SUPPORT default 4 depends on CPU_INTEL_FIRMWARE_INTERFACE_TABLE help diff --git a/src/cpu/intel/fit/Makefile.inc b/src/cpu/intel/fit/Makefile.inc index b4926ba..d3fb23e 100644 --- a/src/cpu/intel/fit/Makefile.inc +++ b/src/cpu/intel/fit/Makefile.inc @@ -9,7 +9,12 @@ cbfs-files-y += intel_fit intel_fit-file := fit_table.c:struct intel_fit-type := raw -intel_fit-align := 16 + +ifneq ($(CONFIG_INTEL_BG_SUPPORT),y) # Set alignment if BootGuard is not set +intel_fit-align := 0x16 +else +intel_fit-position := 0xffff0000 # Set position for BootGuard +endif
$(call add_intermediate, set_fit_ptr, $(IFITTOOL)) @printf " UPDATE-FIT set FIT pointer to table\n"