From 0909d86760aab4f58fd711183ce1b586b493b5e6 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 30 Apr 2012 23:53:56 +0200 Subject: [PATCH] Support adding stages with cbfs-files stages have special cbfstool syntax, which we need to support. Change-Id: I119255246af818f010acfc7ec2091a6184e74eb3 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/961 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/arch/x86/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 45a90acb89..a5116c0871 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)))