[coreboot-gerrit] New patch to review for coreboot: build system: allow modifying cbfstool options for files-in-regions

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

-gerrit

commit 31ab1d95cea5b6eff91ee65feec50abdf457b1ae
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Thu Jan 28 22:34:50 2016 +0100

    build system: allow modifying cbfstool options for files-in-regions
    
    By implementing a more complex options-for-region function, special
    needs for certain files in certain regions can be dealt with.
    
    Change-Id: I2e1e08d5357b717011c41675f76908bf2319f91d
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 Makefile.inc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 8b69109..122b83a 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -645,6 +645,13 @@ extract_nth=$(subst *,$(spc),$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-)
 # multiple CBFSes in fmap regions, override it.
 regions-for-file ?= COREBOOT
 
+# options-for-region
+# $(call options-for-region,$(filename),$(region),$(options))
+#
+# Returns potentially modified options, depending on file and region.
+# Default is to return it unmodified
+options-for-region ?= $(3)
+
 ifeq ($(CONFIG_CBFS_AUTOGEN_ATTRIBUTES),y)
 	cbfs-autogen-attributes=-g
 endif
@@ -660,9 +667,10 @@ define cbfs-add-cmd-for-region
 	$(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) \
 	$(cbfs-autogen-attributes) \
 	-r $(2) \
-	$(if $(call extract_nth,6,$(1)),-a $(call extract_nth,6,$(file)), \
-		$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file)))) \
-	$(call extract_nth,7,$(1))
+	$(call options-for-region,$(call extract_nth,2,$(1)),$(2), \
+		$(if $(call extract_nth,6,$(1)),-a $(call extract_nth,6,$(file)), \
+			$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file)))) \
+		$(call extract_nth,7,$(1)))
 
 endef
 # Empty line before endef is necessary so cbfs-add-cmd-for-region ends in a