[coreboot-gerrit] New patch to review for coreboot: build system: Allow giving additional cbfstool options to cbfs-files-y

[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/12547

-gerrit

commit 8a42cc56435805e65de49fb3b484e3a9f7ba9e2f
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Thu Nov 26 16:37:45 2015 +0100

    build system: Allow giving additional cbfstool options to cbfs-files-y
    
    This enables adding romstage, verstage, and payload, that may need
    additional options (eg. for XIP or for linux initrd arguments) to be
    added with the build system infrastructure instead of manual rules.
    
    Change-Id: Ifde4ec3ca4ab436aca9b51a3c2cc478ed493fbfb
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 Makefile.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 457db5e..236cea1 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -265,12 +265,13 @@ cbfs-files-handler= \
 			$(eval tmp-cbfs-file:=$(shell mkdir -p $(obj)/mainboard/$(MAINBOARDDIR); mktemp $(obj)/mainboard/$(MAINBOARDDIR)/cbfs-file.XXXXXX).out) \
 			$(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \
 		$(if $(tmp-cbfs-file), \
-			$(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))) \
+			$(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align)|$($(2)-options))) \
 		$(eval $(2)-name:=) \
 		$(eval $(2)-type:=) \
 		$(eval $(2)-compression:=) \
 		$(eval $(2)-position:=) \
 		$(eval $(2)-required:=) \
+		$(eval $(2)-options:=) \
 		$(eval $(2)-align:=)
 
 #######################################################################
@@ -590,7 +591,8 @@ cbfs-add-cmd = \
 	       -f $(call extract_nth,1,$(file)) \
 	       -n $(call extract_nth,2,$(file)) \
 	       $(if $(filter-out stage,$(call extract_nth,3,$(file))),-t $(call extract_nth,3,$(file))) \
-	       $(if $(call extract_nth,4,$(file)),-c $(call extract_nth,4,$(file)))
+	       $(if $(call extract_nth,4,$(file)),-c $(call extract_nth,4,$(file))) \
+	       $(call extract_nth,7,$(file))
 
 cbfs-files=$(cbfs-files-fixed) $(cbfs-files-aligned) $(cbfs-files-regular)
 ifneq ($(CONFIG_UPDATE_IMAGE),y)