diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-02-01 12:03:04 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-02-02 14:35:38 +0100 |
| commit | bda8a04b0105f2b097b07fa336891af6981541cb (patch) | |
| tree | 9596901ce90f802b0f7e501a06f9c70da22b6f68 | |
| parent | f92068d9c24f295983e4904d327f342ae39cb9ed (diff) | |
build system: add Chrome OS futility to tools
Change-Id: I08925d110c6faa9e37107d63bfa75d0ab677d379
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/13545
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | Makefile.inc | 6 | ||||
| -rw-r--r-- | util/futility/Makefile | 21 | ||||
| -rw-r--r-- | util/futility/Makefile.inc | 13 |
3 files changed, 39 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc index 122b83a124..06d3e14e86 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -60,6 +60,7 @@ subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*) subdirs-y += $(wildcard src/soc/*/*) $(wildcard src/northbridge/*/*) subdirs-y += src/superio $(wildcard src/drivers/*) src/cpu src/vendorcode subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom +subdirs-y += util/futility subdirs-y += $(wildcard src/arch/*) subdirs-y += src/mainboard/$(MAINBOARDDIR) subdirs-y += payloads/external @@ -396,6 +397,8 @@ $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c CBOOTIMAGE:=$(objutil)/cbootimage/cbootimage +FUTILITY:=$(objutil)/futility/futility + subdirs-y += util/nvidia BIMGTOOL:=$(objutil)/bimgtool/bimgtool @@ -550,7 +553,7 @@ crosstools-power8: clean-for-update crossgcc-clean: clean-for-update $(MAKE) -C util/crossgcc clean -tools: $(objutil)/kconfig/conf $(CBFSTOOL) $(FMAPTOOL) $(RMODTOOL) $(objutil)/nvramtool/nvramtool $(ROMCC_BIN) $(objutil)/sconfig/sconfig $(IFDTOOL) $(IFDFAKE) $(CBOOTIMAGE) $(AMDFWTOOL) +tools: $(objutil)/kconfig/conf $(CBFSTOOL) $(FMAPTOOL) $(RMODTOOL) $(objutil)/nvramtool/nvramtool $(ROMCC_BIN) $(objutil)/sconfig/sconfig $(IFDTOOL) $(IFDFAKE) $(CBOOTIMAGE) $(AMDFWTOOL) $(FUTILITY) test-toolchain: ifeq ($(COMPILER_OUT_OF_DATE),1) @@ -922,6 +925,7 @@ junit.xml: TOOLLIST= \ cbmem \ ectool \ + futility \ inteltool \ intelvbttool \ nvramtool \ diff --git a/util/futility/Makefile b/util/futility/Makefile new file mode 100644 index 0000000000..3ce45ed1ee --- /dev/null +++ b/util/futility/Makefile @@ -0,0 +1,21 @@ +top ?= $(abspath ../..) +objutil ?= $(top)/util + +HOSTCC ?= $(CC) +VB_SOURCE ?= $(top)/3rdparty/vboot + +.PHONY: all +all: $(objutil)/futility/futility + +.PHONY: clean +clean: + $(RM) $(objutil)/futility/futility + $(RM) -r $(objutil)/futility/build + +ifneq ($(V),1) +ifneq ($(Q),) +.SILENT: +endif +endif + +include Makefile.inc diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.inc new file mode 100644 index 0000000000..26b218d742 --- /dev/null +++ b/util/futility/Makefile.inc @@ -0,0 +1,13 @@ +additional-dirs += $(objutil)/futility + +$(objutil)/futility/build/futility/futility: + @printf " MAKE $(subst $(objutil)/,,$(@))\n" + $(MAKE) -C $(VB_SOURCE) \ + BUILD=$(abspath $@/../..) \ + CC="$(HOSTCC)" \ + V=$(V) \ + $(abspath $@) + +$(objutil)/futility/futility: $(objutil)/futility/build/futility/futility + cp $< $@.tmp + mv $@.tmp $@ |