From d6eb72c87eb569000df62456c187329ee4967dc1 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 12 Jan 2021 15:09:57 +0100 Subject: build system: Structure and serialize INTERMEDIATE Target added to INTERMEDIATE all operate on coreboot.pre, each modifying the file in some way. When running them in parallel, coreboot.pre can be read from and written to in parallel which can corrupt the result. Add a function to create those rules that also adds existing INTERMEDIATE targets to enforce an order (as established by evaluation order of Makefile.inc files). While at it, also add the addition to the PHONY target so we don't forget it. BUG=chromium:1154313, b:174585424 TEST=Built a configuration with SeaBIOS + SeaBIOS config files (ps2 timeout and sercon) and saw that they were executed. Change-Id: Ia5803806e6c33083dfe5dec8904a65c46436e756 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/49358 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/security/intel/cbnt/Makefile.inc | 8 ++------ src/security/intel/txt/Makefile.inc | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src/security') diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc index 349d3a9fd2..06ff213b0f 100644 --- a/src/security/intel/cbnt/Makefile.inc +++ b/src/security/intel/cbnt/Makefile.inc @@ -6,9 +6,7 @@ boot_policy_manifest.bin-file := $(CONFIG_INTEL_CBNT_BOOT_POLICY_MANIFEST_BINARY boot_policy_manifest.bin-type := raw boot_policy_manifest.bin-align := 0x10 -PHONY+=add_bpm_fit -INTERMEDIATE+=add_bpm_fit -add_bpm_fit: $(obj)/coreboot.pre $(IFITTOOL) +$(call add_intermediate, add_bpm_fit, $(obj)/coreboot.pre $(IFITTOOL)) $(IFITTOOL) -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< endif @@ -18,9 +16,7 @@ key_manifest.bin-file := $(CONFIG_INTEL_CBNT_KEY_MANIFEST_BINARY) key_manifest.bin-type := raw key_manifest.bin-align := 0x10 -PHONY+=add_km_fit -INTERMEDIATE+=add_km_fit -add_km_fit: $(obj)/coreboot.pre $(IFITTOOL) +$(call add_intermediate, add_km_fit, $(obj)/coreboot.pre $(IFITTOOL)) $(IFITTOOL) -r COREBOOT -a -n key_manifest.bin -t 11 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< endif diff --git a/src/security/intel/txt/Makefile.inc b/src/security/intel/txt/Makefile.inc index dee49493fa..a0d37fb865 100644 --- a/src/security/intel/txt/Makefile.inc +++ b/src/security/intel/txt/Makefile.inc @@ -28,9 +28,7 @@ endif ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) -PHONY+=add_acm_fit -INTERMEDIATE+=add_acm_fit -add_acm_fit: $(obj)/coreboot.pre $(IFITTOOL) +$(call add_intermediate, add_acm_fit, $(obj)/coreboot.pre $(IFITTOOL)) $(IFITTOOL) -r COREBOOT -a -n $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM) -t 2 \ -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< @@ -43,9 +41,7 @@ ibb-files := $(foreach file,$(cbfs-files), \ ibb-files += bootblock -PHONY+=add_ibb_fit -INTERMEDIATE+=add_ibb_fit -add_ibb_fit: $(obj)/coreboot.pre $(IFITTOOL) +$(call add_intermediate, 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 -- cgit v1.2.3