[coreboot-gerrit] New patch to review for coreboot: build system: create fmap for UPDATE_IMAGE configurations, too

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14601

-gerrit

commit 02d00ff4147ff0df67b7e1b919e602e6254eab51
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Wed May 4 07:37:50 2016 +0800

    build system: create fmap for UPDATE_IMAGE configurations, too
    
    This fixes UPDATE_IMAGE builds, assuming that the fmap configuration in
    the tree didn't change, at least as far as the CBFS regions are
    concerned.
    
    Another option would be to synthesize the fmap related files from the
    existing image, but that comes with other issues (eg. what about
    updating images old enough that there is no fmap?) and is more complex,
    so keep it simple, stupid for now.
    
    Change-Id: I036dab9f81f524f7d70bc0029b1ef835e6180a53
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index 812f998..4cdb94a 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -647,7 +647,6 @@ cbfs-files=$(cbfs-files-fixed) $(cbfs-files-aligned) $(cbfs-files-regular)
 prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
 prebuild-files = $(foreach file,$(cbfs-files), $(call cbfs-add-cmd,$(file),$(CONFIG_UPDATE_IMAGE)))
 
-ifneq ($(CONFIG_UPDATE_IMAGE),y)
 ifeq ($(CONFIG_FMDFILE),)
 # For a description of the flash layout described by these variables, check
 # the $(DEFAULT_FLASHMAP) .fmd files.
@@ -707,6 +706,7 @@ $(obj)/fmap.fmap: $(obj)/fmap.fmd $(FMAPTOOL)
 	echo "    FMAP       $(FMAPTOOL) -h $(obj)/fmap_config.h $< $@"
 	$(FMAPTOOL) -h $(obj)/fmap_config.h -R $(obj)/fmap.desc $< $@
 
+ifneq ($(CONFIG_UPDATE_IMAGE),y)
 $(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(obj)/fmap.fmap $(obj)/fmap.desc
 	$(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc)
 ifeq ($(CONFIG_ARCH_X86),y)