GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.inc: don't add fmap_config.h dependency twice 

Commit d054bbd4f1 ("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>
This commit is contained in:
Felix Held 2023-06-22 16:16:45 +02:00
parent b5a032859a
commit 87a9d8ffe6
5 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/smmstore/Makefile.inc
View File

@ -1,13 +1,5 @@
all-$(CONFIG_SMMSTORE) += store.c 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 ramstage-$(CONFIG_SMMSTORE_V2) += ramstage.c
smm-$(CONFIG_SMMSTORE) += store.c smi.c smm-$(CONFIG_SMMSTORE) += store.c smi.c

12
src/lib/Makefile.inc
View File

@ -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,verstage,$(dir)/version.c) : $(obj)/build.h
$(call src-to-obj,postcar,$(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 bootblock-y += bootmode.c
romstage-y += bootmode.c romstage-y += bootmode.c
ramstage-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-type := "cbfs header"
cbfs_master_header-position := 0 cbfs_master_header-position := 0
ifeq ($(CONFIG_ARCH_X86),y) bootblock-$(CONFIG_ARCH_X86) += master_header_pointer.c
$(call src-to-obj,bootblock,$(dir)/master_header_pointer.c): $(obj)/fmap_config.h
bootblock-y += master_header_pointer.c
endif
NEED_CBFS_POINTER= NEED_CBFS_POINTER=

5
src/security/vboot/Makefile.inc
View File

@ -73,11 +73,6 @@ romstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c
ramstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c ramstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c
postcar-$(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 bootblock-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c
verstage-$(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 romstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c

3
src/soc/amd/common/block/apob/Makefile.inc
View File

@ -3,7 +3,4 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_APOB),y)
romstage-y += apob_cache.c romstage-y += apob_cache.c
ramstage-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 endif # CONFIG_SOC_AMD_COMMON_BLOCK_APOB

5
src/vendorcode/eltan/security/verified_boot/Makefile.inc
View File

@ -10,11 +10,6 @@ postcar-y += vboot_check.c
romstage-y += vboot_check.c romstage-y += vboot_check.c
ramstage-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) ifeq ($(CONFIG_VENDORCODE_ELTAN_VBOOT),y)
cbfs-files-y += oemmanifest.bin cbfs-files-y += oemmanifest.bin
oemmanifest.bin-file := $(obj)/oemmanifest.bin oemmanifest.bin-file := $(obj)/oemmanifest.bin