From 87a9d8ffe641480c86eb8e856480692748930b8e Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 22 Jun 2023 16:16:45 +0200 Subject: [PATCH] Makefile.inc: don't add fmap_config.h dependency twice Commit d054bbd4f1ba ("Makefile.inc: fix multiple jobs build issue") added a dependency on $(obj)/fmap_config.h to all .c source files in all stages, so it's not needed any more to add it as a dependency to files that include fmap_config.h. Signed-off-by: Felix Held Change-Id: I7b62917f32ae9f51f079b243a606e5db07ca9099 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76002 Reviewed-by: Nico Huber Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) Reviewed-by: Fred Reitberger --- src/drivers/smmstore/Makefile.inc | 8 -------- src/lib/Makefile.inc | 12 +----------- src/security/vboot/Makefile.inc | 5 ----- src/soc/amd/common/block/apob/Makefile.inc | 3 --- .../eltan/security/verified_boot/Makefile.inc | 5 ----- 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/drivers/smmstore/Makefile.inc b/src/drivers/smmstore/Makefile.inc index 1c2e3367ae..b37637b2b5 100644 --- a/src/drivers/smmstore/Makefile.inc +++ b/src/drivers/smmstore/Makefile.inc @@ -1,13 +1,5 @@ all-$(CONFIG_SMMSTORE) += store.c -ifeq ($(CONFIG_SMMSTORE),y) -$(call src-to-obj,bootblock,$(dir)/store.c) : $(obj)/fmap_config.h -$(call src-to-obj,verstage,$(dir)/store.c) : $(obj)/fmap_config.h -$(call src-to-obj,romstage,$(dir)/store.c) : $(obj)/fmap_config.h -$(call src-to-obj,postcar,$(dir)/store.c) : $(obj)/fmap_config.h -$(call src-to-obj,ramstage,$(dir)/store.c) : $(obj)/fmap_config.h -$(call src-to-obj,smm,$(dir)/store.c) : $(obj)/fmap_config.h -endif ramstage-$(CONFIG_SMMSTORE_V2) += ramstage.c smm-$(CONFIG_SMMSTORE) += store.c smi.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 28e8dd39c1..53ff2d36cf 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -241,13 +241,6 @@ $(call src-to-obj,smm,$(dir)/version.c) : $(obj)/build.h $(call src-to-obj,verstage,$(dir)/version.c) : $(obj)/build.h $(call src-to-obj,postcar,$(dir)/version.c) : $(obj)/build.h -$(call src-to-obj,bootblock,$(dir)/fmap.c) : $(obj)/fmap_config.h -$(call src-to-obj,romstage,$(dir)/fmap.c) : $(obj)/fmap_config.h -$(call src-to-obj,ramstage,$(dir)/fmap.c) : $(obj)/fmap_config.h -$(call src-to-obj,smm,$(dir)/fmap.c) : $(obj)/fmap_config.h -$(call src-to-obj,verstage,$(dir)/fmap.c) : $(obj)/fmap_config.h -$(call src-to-obj,postcar,$(dir)/fmap.c) : $(obj)/fmap_config.h - bootblock-y += bootmode.c romstage-y += bootmode.c ramstage-y += bootmode.c @@ -412,10 +405,7 @@ cbfs_master_header-file := cbfs_master_header.c:struct cbfs_master_header-type := "cbfs header" cbfs_master_header-position := 0 -ifeq ($(CONFIG_ARCH_X86),y) -$(call src-to-obj,bootblock,$(dir)/master_header_pointer.c): $(obj)/fmap_config.h -bootblock-y += master_header_pointer.c -endif +bootblock-$(CONFIG_ARCH_X86) += master_header_pointer.c NEED_CBFS_POINTER= diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index ba83c3bd6a..62a566019f 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -73,11 +73,6 @@ romstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c ramstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c postcar-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c -$(call src-to-obj,bootblock,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h -$(call src-to-obj,verstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h -$(call src-to-obj,romstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h -$(call src-to-obj,ramstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h -$(call src-to-obj,postcar,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h bootblock-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c verstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c romstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c diff --git a/src/soc/amd/common/block/apob/Makefile.inc b/src/soc/amd/common/block/apob/Makefile.inc index 746e015103..ae550bc522 100644 --- a/src/soc/amd/common/block/apob/Makefile.inc +++ b/src/soc/amd/common/block/apob/Makefile.inc @@ -3,7 +3,4 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_APOB),y) romstage-y += apob_cache.c ramstage-y += apob_cache.c -$(call src-to-obj,romstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h -$(call src-to-obj,ramstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h - endif # CONFIG_SOC_AMD_COMMON_BLOCK_APOB diff --git a/src/vendorcode/eltan/security/verified_boot/Makefile.inc b/src/vendorcode/eltan/security/verified_boot/Makefile.inc index aef81943a8..9158760322 100644 --- a/src/vendorcode/eltan/security/verified_boot/Makefile.inc +++ b/src/vendorcode/eltan/security/verified_boot/Makefile.inc @@ -10,11 +10,6 @@ postcar-y += vboot_check.c romstage-y += vboot_check.c ramstage-y += vboot_check.c -$(call src-to-obj,bootblock,$(dir)/vboot_check.c) : $(obj)/fmap_config.h -$(call src-to-obj,postcar,$(dir)/vboot_check.c) : $(obj)/fmap_config.h -$(call src-to-obj,romstage,$(dir)/vboot_check.c) : $(obj)/fmap_config.h -$(call src-to-obj,ramstage,$(dir)/vboot_check.c) : $(obj)/fmap_config.h - ifeq ($(CONFIG_VENDORCODE_ELTAN_VBOOT),y) cbfs-files-y += oemmanifest.bin oemmanifest.bin-file := $(obj)/oemmanifest.bin