diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2016-07-24 12:14:38 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-08-08 12:17:00 +0200 |
| commit | 61486b506d5f3be1ea02aa82df290bd7c18b1fda (patch) | |
| tree | 1f769d59eec95dba1740cd5316929fbce3c84c1c /util/cbfstool | |
| parent | 5d4194978275c2e3acf09788f80887023ca9ffe8 (diff) | |
Use VBOOT_SOURCE instead of hardcoding vboot path
This replaces all occurrences of a hardcoded vboot path to the
VBOOT_SOURCE variable, that may be overridden from the command line,
witch fallback to the source from 3rdparty.
Change-Id: Ia57d498d38719cc71e17060b76b0162c4ab363ed
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-on: https://review.coreboot.org/15825
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'util/cbfstool')
| -rw-r--r-- | util/cbfstool/Makefile | 2 | ||||
| -rw-r--r-- | util/cbfstool/Makefile.inc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 320485749b..d6249bc24e 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -6,6 +6,8 @@ CONFIG_FMD_GENPARSER ?= n HOSTCC ?= $(CC) OBJCOPY ?= objcopy +VBOOT_SOURCE ?= $(top)/3rdparty/vboot + .PHONY: all all: cbfstool fmaptool rmodtool ifwitool diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 8c9a2c01bd..d666f6a06f 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -72,8 +72,8 @@ TOOLCPPFLAGS += -I$(top)/util/cbfstool TOOLCPPFLAGS += -I$(objutil)/cbfstool TOOLCPPFLAGS += -I$(top)/src/commonlib/include TOOLCPPFLAGS += -DNEED_VB2_SHA_LIBRARY -TOOLCPPFLAGS += -I$(top)/3rdparty/vboot/firmware/include -TOOLCPPFLAGS += -I$(top)/3rdparty/vboot/firmware/2lib/include +TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/include +TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/2lib/include # UEFI header file support. It's not pretty, but that's what we currently # have right now. TOOLCPPFLAGS += -I$(top)/src @@ -112,7 +112,7 @@ $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< -$(objutil)/cbfstool/%.o: $(top)/3rdparty/vboot/firmware/2lib/%.c +$(objutil)/cbfstool/%.o: $(VBOOT_SOURCE)/firmware/2lib/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< |