[coreboot] New patch to review for coreboot: 2558f47 Support adding stages with cbfs-files

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/961

-gerrit

commit 2558f479d59042d9748ba931fa2436cc07faa933
Author: Patrick Georgi 
Date:   Mon Apr 30 23:53:56 2012 +0200

Support adding stages with cbfs-files

stages have special cbfstool syntax, which we need to support.

Change-Id: I119255246af818f010acfc7ec2091a6184e74eb3
    Signed-off-by: Patrick Georgi 
---
 src/arch/x86/Makefile.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 45a90ac..a5116c0 100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -58,8 +58,8 @@ extract_nth=$(word $(1), $(subst |, ,$(2)))
 ifneq ($(CONFIG_UPDATE_IMAGE),y)
 prebuild-files = \
    $(foreach file,$(cbfs-files), \
-	$(CBFSTOOL) $@.tmp add $(call extract_nth,1,$(file)) \
-	$(call extract_nth,2,$(file)) $(call extract_nth,3,$(file)) \
+	$(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))) \
    $(call extract_nth,4,$(file)) &&)
 prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))