Change in coreboot[master]: Make: Add supermicro/smcbiosinfo to tools

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Make: Add supermicro/smcbiosinfo to tools

Build the smcbiosinfo tool with other tools.

Fixes possible race condition on jenkins.

Change-Id: I38f7ee2fdef2818ad685b3de53ad74f7da50600f
Signed-off-by: Patrick Rudolph 
---
M Makefile.inc
M util/supermicro/Makefile.inc
2 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/38270/1

diff --git a/Makefile.inc b/Makefile.inc
index a54e57b..002d3e7 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -641,7 +641,7 @@
 include util/crossgcc/Makefile.inc

.PHONY: tools
-tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL)
+tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo

###########################################################################
 # Common recipes for all stages
diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.inc
index e71cfbd..1aa5bcb 100644
--- a/util/supermicro/Makefile.inc
+++ b/util/supermicro/Makefile.inc
@@ -1,6 +1,3 @@
-ifeq ($(CONFIG_VENDOR_SUPERMICRO),y)
-ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),)
-
 SMCBIOSINFOTOOL:= $(objutil)/supermicro/smcbiosinfo

$(SMCBIOSINFOTOOL): $(dir)/smcbiosinfo/smcbiosinfo.c
@@ -8,6 +5,9 @@
    mkdir -p $(objutil)/supermicro
    $(HOSTCC) $< -o $@

+ifeq ($(CONFIG_VENDOR_SUPERMICRO),y)
+ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),)
+
 cbfs-files-y += smcbiosinfo.bin

smcbiosinfo.bin-file := $(obj)/mainboard/$(MAINBOARDDIR)/smcbiosinfo.bin

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1: Code-Review+2

[Christian Walter (Code Review)]

Christian Walter has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1: Code-Review+1

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1:

Why is moving this fixing the issue? I do not understand it.

[ron minnich (Code Review)]

ron minnich has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Patch Set 1:
> Why is moving this fixing the issue? I do not understand it.

It's not just shuffling things around. `smcbiosinfo` is added
to the `tools` target so that it gets built in advance by abuild,
before any parallel board builds. Moving the `ifeq` around is
required so that it can be built without depending on a `.config`.

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38270 )

Change subject: Make: Add supermicro/smcbiosinfo to tools
......................................................................

Make: Add supermicro/smcbiosinfo to tools

Build the smcbiosinfo tool with other tools.

Fixes possible race condition on jenkins.

Change-Id: I38f7ee2fdef2818ad685b3de53ad74f7da50600f
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38270
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Christian Walter 
Reviewed-by: ron minnich 
Reviewed-by: Angel Pons 
---
M Makefile.inc
M util/supermicro/Makefile.inc
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  ron minnich: Looks good to me, approved
  Nico Huber: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Christian Walter: Looks good to me, but someone else must approve

diff --git a/Makefile.inc b/Makefile.inc
index a54e57b..002d3e7 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -641,7 +641,7 @@
 include util/crossgcc/Makefile.inc

.PHONY: tools
-tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL)
+tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo

###########################################################################
 # Common recipes for all stages
diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.inc
index e71cfbd..1aa5bcb 100644
--- a/util/supermicro/Makefile.inc
+++ b/util/supermicro/Makefile.inc
@@ -1,6 +1,3 @@
-ifeq ($(CONFIG_VENDOR_SUPERMICRO),y)
-ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),)
-
 SMCBIOSINFOTOOL:= $(objutil)/supermicro/smcbiosinfo

$(SMCBIOSINFOTOOL): $(dir)/smcbiosinfo/smcbiosinfo.c
@@ -8,6 +5,9 @@
    mkdir -p $(objutil)/supermicro
    $(HOSTCC) $< -o $@

+ifeq ($(CONFIG_VENDOR_SUPERMICRO),y)
+ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),)
+
 cbfs-files-y += smcbiosinfo.bin

smcbiosinfo.bin-file := $(obj)/mainboard/$(MAINBOARDDIR)/smcbiosinfo.bin