[coreboot-gerrit] Patch set updated for coreboot: e1a4ccd update_image: add all CBFS_PREFIX files to cbfs

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10410

-gerrit

commit e1a4ccdf14f3d290394a854c730e8c0c589fe002
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Wed Jun 3 11:54:59 2015 -0500

    update_image: add all CBFS_PREFIX files to cbfs
    
    In order to accomodate objects not directly linked into ramstage
    anymore those files need to be added to the image when UPDATE_IMAGE
    is selected. Otherwise many required pieces are missing from booting
    correctly.
    
    Change-Id: Ic0b24387d24d0af3b75f5fd6fa1795fd381c4d58
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 Makefile.inc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 585fd17..0ecd927 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -552,9 +552,21 @@ $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(
 	$(call add-cpu-microcode-to-cbfs,$@.tmp)
 	mv $@.tmp $@
 else
+prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# Add all cbfs files to image have the form: CONFIG_CBFS_PREFIX/<filename>
+prebuild-files = \
+	$(foreach file,$(cbfs-files), \
+	       $(if $(filter $(call strip_quotes, $(CONFIG_CBFS_PREFIX))/%,\
+	           $(call extract_nth,2,$(file))), \
+	       $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \
+	       $(cbfs-add-cmd) -b {} &&,\
+	       $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)))
+
 .PHONY: $(obj)/coreboot.pre1
-$(obj)/coreboot.pre1: $(CBFSTOOL)
-	mv $(obj)/coreboot.rom $@
+$(obj)/coreboot.pre1: $$(prebuilt-files) $(CBFSTOOL)
+	mv $(obj)/coreboot.rom $@.tmp
+	$(prebuild-files) true
+	mv $@.tmp $@
 endif
 
 ifeq ($(CONFIG_PAYLOAD_LINUX),y)