diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2020-01-08 15:44:21 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2020-01-08 16:24:04 +0000 |
| commit | a48e8f52d872ef9ce848d7337839430204f5b355 (patch) | |
| tree | 957c105ed0495d3797c73c6b6a4e59b96957ee7e | |
| parent | 6779d2352cd33f98ad03e800c0de472fd3d3dfcc (diff) | |
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 <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38270
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Reviewed-by: ron minnich <rminnich@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | util/supermicro/Makefile.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc b/Makefile.inc index a54e57bc6c..002d3e7d0b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -641,7 +641,7 @@ install-git-commit-clangfmt: 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 e71cfbdb19..1aa5bcb437 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 @@ $(SMCBIOSINFOTOOL): $(dir)/smcbiosinfo/smcbiosinfo.c 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 |