Change in coreboot[master]: Makefile: Allow platform to provide additional params for add cmd

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47884 )

Change subject: Makefile: Allow platform to provide additional params for add cmd
......................................................................

Makefile: Allow platform to provide additional params for add cmd

This change adds optional CBFSTOOL_ADD_CMD_OPTIONS that can be used by
arch/SoC/mainboard Makefiles to supply any additional arguments that
need to be passed into cbfstool when using cbfstool add command.
This is useful when platform wants to add these parameters depending
upon some arch/SoC/mainboard specific configs. Immediate use case is
the fast SPI controller on Intel platforms adding arguments for
extended window base and size.

BUG=b:171534504

Change-Id: I2f48bc3f494d9a5da7e99b530a39d6078b4a881c
Signed-off-by: Furquan Shaikh 
---
M Makefile.inc
1 file changed, 11 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/47884/1

diff --git a/Makefile.inc b/Makefile.inc
index 9273961..2dc615f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -836,6 +836,10 @@

# cbfs-add-cmd-for-region
 # $(call cbfs-add-cmd-for-region,file in extract_nth format,region name)
+#
+# CBFSTOOL_ADD_CMD_OPTIONS can be used by arch/SoC/mainboard to supply
+# add commands with any additional arguments for cbfstool.
+# Example: --ext-win-base <base> --ext-win-size <size>
 define cbfs-add-cmd-for-region
    $(CBFSTOOL) $@.tmp \
    add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \
@@ -850,8 +854,8 @@
    -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 extract_nth,7,$(1)) \
+	$(CBFSTOOL_ADD_CMD_OPTIONS)

endef
 # Empty line before endef is necessary so cbfs-add-cmd-for-region ends in a
@@ -1086,7 +1090,8 @@
    	$(TXTIBB) \
    	$(CBNTIBB) \
    	-b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \
-		$(TS_OPTIONS)
+		$(TS_OPTIONS) \
+		$(CBFSTOOL_ADD_CMD_OPTIONS)
 else # ifeq ($(CONFIG_ARCH_X86),y)
    $(CBFSTOOL) $@.tmp write -u \
    	-r BOOTBLOCK \
@@ -1098,10 +1103,11 @@
    	-f $@.tmp.2 \
    	-n "header pointer" \
    	-t "cbfs header" \
-		-b -4
+		-b -4 \
+		$(CBFSTOOL_ADD_CMD_OPTIONS)
    rm -f $@.tmp.2
 endif # ifeq ($(CONFIG_ARCH_X86),y)
-	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS)
+	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
    $(prebuild-files) true
    mv $@.tmp $@
 else # ifneq ($(CONFIG_UPDATE_IMAGE),y)

[Srinidhi N Kaushik (Code Review)]

Srinidhi N Kaushik has uploaded a new patch set (#5) to the change originally created by Furquan Shaikh. ( https://review.coreboot.org/c/coreboot/+/47884 )

Change subject: Makefile: Allow platform to provide additional params for add cmd
......................................................................

Makefile: Allow platform to provide additional params for add cmd

This change adds optional CBFSTOOL_ADD_CMD_OPTIONS that can be used by
arch/SoC/mainboard Makefiles to supply any additional arguments that
need to be passed into cbfstool when using cbfstool add command.
This is useful when platform wants to add these parameters depending
upon some arch/SoC/mainboard specific configs. Immediate use case is
the fast SPI controller on Intel platforms adding arguments for
extended window base and size.

BUG=b:171534504

Change-Id: I2f48bc3f494d9a5da7e99b530a39d6078b4a881c
Signed-off-by: Furquan Shaikh 
---
M Makefile.inc
1 file changed, 11 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/47884/5

[Furquan Shaikh (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Duncan Laurie, Tim Wawrzynczak, Srinidhi N Kaushik,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47884

to look at the new patch set (#13).

Change subject: Makefile: Allow platform to provide additional params for add cmd
......................................................................

Makefile: Allow platform to provide additional params for add cmd

This change adds optional CBFSTOOL_ADD_CMD_OPTIONS that can be used by
arch/SoC/mainboard Makefiles to supply any additional arguments that
need to be passed into cbfstool when using cbfstool add command.
This is useful when platform wants to add these parameters depending
upon some arch/SoC/mainboard specific configs. Immediate use case is
the fast SPI controller on Intel platforms adding arguments for
extended window base and size.

BUG=b:171534504

Change-Id: I2f48bc3f494d9a5da7e99b530a39d6078b4a881c
Signed-off-by: Furquan Shaikh 
---
M Makefile.inc
1 file changed, 11 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/47884/13

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47884 )

Change subject: Makefile: Allow platform to provide additional params for add cmd
......................................................................

Patch Set 13: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47884 )

Change subject: Makefile: Allow platform to provide additional params for add cmd
......................................................................

Makefile: Allow platform to provide additional params for add cmd

This change adds optional CBFSTOOL_ADD_CMD_OPTIONS that can be used by
arch/SoC/mainboard Makefiles to supply any additional arguments that
need to be passed into cbfstool when using cbfstool add command.
This is useful when platform wants to add these parameters depending
upon some arch/SoC/mainboard specific configs. Immediate use case is
the fast SPI controller on Intel platforms adding arguments for
extended window base and size.

BUG=b:171534504

Change-Id: I2f48bc3f494d9a5da7e99b530a39d6078b4a881c
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47884
Reviewed-by: Tim Wawrzynczak 
Tested-by: build bot (Jenkins) 
---
M Makefile.inc
1 file changed, 11 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/Makefile.inc b/Makefile.inc
index 420ce51..8cba96b 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -833,6 +833,10 @@

# cbfs-add-cmd-for-region
 # $(call cbfs-add-cmd-for-region,file in extract_nth format,region name)
+#
+# CBFSTOOL_ADD_CMD_OPTIONS can be used by arch/SoC/mainboard to supply
+# add commands with any additional arguments for cbfstool.
+# Example: --ext-win-base <base> --ext-win-size <size>
 define cbfs-add-cmd-for-region
    $(CBFSTOOL) $@.tmp \
    add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \
@@ -847,8 +851,8 @@
    -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 extract_nth,7,$(1)) \
+	$(CBFSTOOL_ADD_CMD_OPTIONS)

endef
 # Empty line before endef is necessary so cbfs-add-cmd-for-region ends in a
@@ -1083,7 +1087,8 @@
    	$(TXTIBB) \
    	$(CBNTIBB) \
    	-b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \
-		$(TS_OPTIONS)
+		$(TS_OPTIONS) \
+		$(CBFSTOOL_ADD_CMD_OPTIONS)
 else # ifeq ($(CONFIG_ARCH_X86),y)
    $(CBFSTOOL) $@.tmp write -u \
    	-r BOOTBLOCK \
@@ -1095,10 +1100,11 @@
    	-f $@.tmp.2 \
    	-n "header pointer" \
    	-t "cbfs header" \
-		-b -4
+		-b -4 \
+		$(CBFSTOOL_ADD_CMD_OPTIONS)
    rm -f $@.tmp.2
 endif # ifeq ($(CONFIG_ARCH_X86),y)
-	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS)
+	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
    $(prebuild-files) true
    mv $@.tmp $@
 else # ifneq ($(CONFIG_UPDATE_IMAGE),y)