[coreboot] New patch to review for coreboot: 3cc2c6d Change to allow coreboot to use "add-payload" instead of "add" for payload images.

[Dave Frodin (dave.frodin@se-eng.com)]

Dave Frodin (dave.frodin at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1451

-gerrit

commit 3cc2c6d9b2afb8e0489b521252946b3a6a84e6bf
Author: Dave Frodin <dave.frodin at se-eng.com>
Date:   Tue Aug 14 10:59:17 2012 -0600

    Change to allow coreboot to use "add-payload" instead of "add" for payload images.
    
    The current code does some argument manipulation to detect when a stage is being
    added to cbfs. This same manipulation needs to be done when adding a payload.
    
    Change-Id: Ief4c4a81446c9437923cbbb1ce3fa90729317587
    Signed-off-by: Dave Frodin <dave.frodin at se-eng.com>
---
 src/arch/x86/Makefile.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 306f239..71d359f 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -61,8 +61,10 @@ extract_nth=$(word $(1), $(subst |, ,$(2)))
 ifneq ($(CONFIG_UPDATE_IMAGE),y)
 prebuild-files = \
 	$(foreach file,$(cbfs-files), \
-	$(CBFSTOOL) $@.tmp add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage) $(call extract_nth,1,$(file)) \
-	$(call extract_nth,2,$(file)) $(if $(filter-out stage,$(call extract_nth,3,$(file))),$(call extract_nth,3,$(file))) \
+	$(CBFSTOOL) $@.tmp \
+	add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage)$(if $(filter payload,$(call extract_nth,3,$(file))),-payload) \
+	$(call extract_nth,1,$(file)) \
+	$(call extract_nth,2,$(file)) $(if $(filter-out stage payload,$(call extract_nth,3,$(file))),$(call extract_nth,3,$(file))) \
 	$(call extract_nth,4,$(file)) &&)
 prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))