diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2019-02-19 10:57:16 +0100 |
|---|---|---|
| committer | David Hendricks <david.hendricks@gmail.com> | 2019-10-18 15:38:19 +0000 |
| commit | d9c799c5296c8f300031dafade682cf613ec4d34 (patch) | |
| tree | a5fea47be474ac35efc557150c3e6ed778066974 /src | |
| parent | 7ba58718defffdddc785507809b25b231a889d27 (diff) | |
| download | coreboot-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')
| -rw-r--r-- | src/drivers/intel/fsp1_0/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/drivers/intel/fsp1_1/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/security/intel/txt/Makefile.inc | 12 | ||||
| -rw-r--r-- | src/security/vboot/Makefile.inc | 1 |
5 files changed, 17 insertions, 4 deletions
diff --git a/src/drivers/intel/fsp1_0/Makefile.inc b/src/drivers/intel/fsp1_0/Makefile.inc index 604b9bc0a7..ad36acc755 100644 --- a/src/drivers/intel/fsp1_0/Makefile.inc +++ b/src/drivers/intel/fsp1_0/Makefile.inc @@ -30,7 +30,7 @@ cbfs-files-y += fsp.bin fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE)) fsp.bin-position := $(CONFIG_FSP_LOC) fsp.bin-type := fsp -fsp.bin-options := --xip +fsp.bin-options := --xip $(TXTIBB) endif ifeq ($(CONFIG_ENABLE_MRC_CACHE),y) diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc index 1372e98565..a40ed8565c 100644 --- a/src/drivers/intel/fsp1_1/Makefile.inc +++ b/src/drivers/intel/fsp1_1/Makefile.inc @@ -52,7 +52,7 @@ ifeq ($(CONFIG_HAVE_FSP_BIN),y) cbfs-files-y += fsp.bin fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE)) fsp.bin-type := fsp -fsp.bin-options := --xip +fsp.bin-options := --xip $(TXTIBB) fsp.bin-COREBOOT-position := $(CONFIG_FSP_LOC) endif diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index b0a1f2b4e2..358ac873c1 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -50,14 +50,14 @@ cbfs-files-$(CONFIG_FSP_CAR) += $(CONFIG_FSP_T_CBFS) $(CONFIG_FSP_T_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_T_FILE)) $(CONFIG_FSP_T_CBFS)-type := fsp ifeq ($(CONFIG_FSP_T_XIP),y) -$(CONFIG_FSP_T_CBFS)-options := --xip +$(CONFIG_FSP_T_CBFS)-options := --xip $(TXTIBB) endif cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(CONFIG_FSP_M_CBFS) $(CONFIG_FSP_M_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE)) $(CONFIG_FSP_M_CBFS)-type := fsp ifeq ($(CONFIG_FSP_M_XIP),y) -$(CONFIG_FSP_M_CBFS)-options := --xip +$(CONFIG_FSP_M_CBFS)-options := --xip $(TXTIBB) endif cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(CONFIG_FSP_S_CBFS) 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) |