summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2019-02-19 10:57:16 +0100
committerDavid Hendricks <david.hendricks@gmail.com>2019-10-18 15:38:19 +0000
commitd9c799c5296c8f300031dafade682cf613ec4d34 (patch)
treea5fea47be474ac35efc557150c3e6ed778066974 /src/security
parent7ba58718defffdddc785507809b25b231a889d27 (diff)
downloadcoreboot-d9c799c5296c8f300031dafade682cf613ec4d34.tar.xz
build: Mark bootblock files on x86 as IBB
* Add cbfsoption --ibb to mark files as IBB * Will be used by "Legacy FIT TXT" boot Change-Id: I83313f035e7fb7e1eb484b323862522e28cb73d4 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31497 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/intel/txt/Makefile.inc12
-rw-r--r--src/security/vboot/Makefile.inc1
2 files changed, 13 insertions, 0 deletions
diff --git a/src/security/intel/txt/Makefile.inc b/src/security/intel/txt/Makefile.inc
index d24026ae62..38eb65d69c 100644
--- a/src/security/intel/txt/Makefile.inc
+++ b/src/security/intel/txt/Makefile.inc
@@ -17,4 +17,16 @@ INTERMEDIATE+=add_acm_fit
add_acm_fit: $(obj)/coreboot.pre $(IFITTOOL)
$(IFITTOOL) -r COREBOOT -a -n txt_bios_acm.bin -t 2 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $<
+# Initial BootBlock files
+ibb-files := $(foreach file,$(cbfs-files), \
+ $(if $(shell echo '$(call extract_nth,7,$(file))'|grep -- --ibb), \
+ $(call extract_nth,2,$(file)),))
+
+ibb-files += bootblock
+
+INTERMEDIATE+=add_ibb_fit
+add_ibb_fit: $(obj)/coreboot.pre $(IFITTOOL)
+ $(foreach file, $(ibb-files), $(shell $(IFITTOOL) -f $< -a -n $(file) -t 7 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) \
+ -r COREBOOT)) true
+
endif
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index abb8863c02..31c0f5de26 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -155,6 +155,7 @@ $(CONFIG_CBFS_PREFIX)/verstage-options += --xip
endif
endif
+$(CONFIG_CBFS_PREFIX)/verstage-options += $(TXTIBB)
else # CONFIG_VBOOT_SEPARATE_VERSTAGE
ifeq ($(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),y)