[coreboot-gerrit] Change in coreboot[master]: security/intel/cbnt/Makefile.inc: Improve build flow

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56119 )

Change subject: security/intel/cbnt/Makefile.inc: Improve build flow
......................................................................

security/intel/cbnt/Makefile.inc: Improve build flow

Now that adding all files to cbfs is a distinct Makefile target in the
buildprocess called "add_prebuild_files", it can be used to streamline
setting up cbnt. Using 'files_added::' is not needed any longer.

Change-Id: I22aa140202f0665b7095a01cb138af4986aa9ac3
Signed-off-by: Arthur Heymans 
---
M src/security/intel/cbnt/Makefile.inc
1 file changed, 6 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/56119/1

diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc
index cc18b20..7bbe612 100644
--- a/src/security/intel/cbnt/Makefile.inc
+++ b/src/security/intel/cbnt/Makefile.inc
@@ -47,11 +47,11 @@

ifeq ($(CONFIG_INTEL_CBNT_GENERATE_BPM),y)
 ifeq ($(CONFIG_INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE),y)
-$(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) $(CBNT_CFG)
+$(obj)/bpm_unsigned.bin: $(obj)/coreboot.pre $(CBNT_PROV) $(CBNT_CFG) add_prebuild_files
    printf "    CBNT_PROV    creating unsigned BPM using config file\n"
    $(CBNT_PROV) bpm-gen $@ $< --config=$(CBNT_CFG) --cut
 else
-$(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV)
+$(obj)/bpm_unsigned.bin: $(obj)/coreboot.pre $(CBNT_PROV) add_prebuild_files
    printf "    CBNT_PROV    creating unsigned BPM\n"
    $(CBNT_PROV) bpm-gen $@ $< --revision=$(CONFIG_INTEL_CBNT_BPM_REVISION) \
    			 --svn=$(CONFIG_INTEL_CBNT_BPM_SVN) \
@@ -86,11 +86,12 @@
    $(CBNT_PROV) bpm-sign $< $@ $(CONFIG_INTEL_CBNT_BPM_PRIV_KEY_FILE) ""

# Add BPM at the end of the build when all files have been added
-files_added:: $(obj)/bpm.bin
+$(call add_intermediate, add_bpm, $(obj)/bpm.bin)
    printf "    CBNT       Adding BPM\n"
-	$(CBFSTOOL) $(obj)/coreboot.rom add -f $< -n boot_policy_manifest.bin -a 0x10 -t raw
+	$(CBFSTOOL) $< add -f $(obj)/bpm.bin -n boot_policy_manifest.bin -a 0x10 -t raw
+$(call add_intermediate, fit_bpm, add_bpm)
    printf "    IFITTOOL   Adding BPM\n"
-	$(IFITTOOL) -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $(obj)/coreboot.rom
+	$(IFITTOOL) -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $<

endif # CONFIG_INTEL_CBNT_BPM_ONLY_UNSIGNED