Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/76002?usp=email )
Change subject: Makefile.inc: don't add fmap_config.h dependency twice ......................................................................
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 felix-coreboot@felixheld.de Change-Id: I7b62917f32ae9f51f079b243a606e5db07ca9099 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76002 Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Martin Roth martin.roth@amd.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Fred Reitberger reitbergerfred@gmail.com --- M src/drivers/smmstore/Makefile.inc M src/lib/Makefile.inc M src/security/vboot/Makefile.inc M src/soc/amd/common/block/apob/Makefile.inc M src/vendorcode/eltan/security/verified_boot/Makefile.inc 5 files changed, 1 insertion(+), 32 deletions(-)
Approvals: Nico Huber: Looks good to me, but someone else must approve Martin Roth: Looks good to me, approved Fred Reitberger: Looks good to me, but someone else must approve build bot (Jenkins): Verified
diff --git a/src/drivers/smmstore/Makefile.inc b/src/drivers/smmstore/Makefile.inc index 1c2e336..b37637b 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 28e8dd3..53ff2d3 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -241,13 +241,6 @@ $(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-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 ba83c3b..62a5660 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -73,11 +73,6 @@ 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 746e015..ae550bc 100644 --- a/src/soc/amd/common/block/apob/Makefile.inc +++ b/src/soc/amd/common/block/apob/Makefile.inc @@ -3,7 +3,4 @@ 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 aef8194..9158760 100644 --- a/src/vendorcode/eltan/security/verified_boot/Makefile.inc +++ b/src/vendorcode/eltan/security/verified_boot/Makefile.inc @@ -10,11 +10,6 @@ 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
-
Felix Held (Code Review)