diff options
author | Patrick Georgi <patrick@georgi-clan.de> | 2012-04-30 23:53:56 +0200 |
---|---|---|
committer | Patrick Georgi <patrick@georgi-clan.de> | 2012-05-01 11:35:34 +0200 |
commit | 0909d86760aab4f58fd711183ce1b586b493b5e6 (patch) | |
tree | b7cd2bfd58328376e55d265a4ec479f964546927 | |
parent | 843005c7694cd9866b293267e2b57e87c6cb490d (diff) |
Support adding stages with cbfs-files
stages have special cbfstool syntax, which we need to support.
Change-Id: I119255246af818f010acfc7ec2091a6184e74eb3
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/961
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
-rwxr-xr-x | 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 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))) |