diff options
| author | Martin Roth <martin@coreboot.org> | 2022-02-25 17:28:04 -0700 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2022-02-26 01:24:17 +0000 |
| commit | e3e965b13d4806b47aca23a256823efe4319ef5f (patch) | |
| tree | 70c91a1a4170161bb3cc70556f058e3e192eee74 /util/cbfstool/Makefile.inc | |
| parent | b4156412dbeee1c9fc3354a9c75a54e84a735dbc (diff) | |
| download | coreboot-4.16_branch.tar.gz coreboot-4.16_branch.tar.bz2 coreboot-4.16_branch.zip | |
Revert "util/cbfstool: Port elogtool to libflashrom"4.164.16_branch
This reverts commit d74b8d9c990780ba64515b36aaff79d719d71ead.
This change breaks the 'make all' build of the cbfstool tools
from the util/cbfstool directory unless libflashrom-dev is
installed, complaining that flashrom is not installed.
Even with libflashrom-dev installed, it breaks building
elogtool with the public version of libflashrom-dev.
Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I572daa0c0f3998e20a8ed76df21228fdbb384baf
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62404
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: ron minnich <rminnich@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/cbfstool/Makefile.inc')
| -rw-r--r-- | util/cbfstool/Makefile.inc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index a568e9aef649..3787a5657809 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -1,5 +1,3 @@ -HOSTPKGCONFIG ?= /usr/bin/pkg-config - compressionobj := compressionobj += compress.o # LZ4 @@ -94,7 +92,6 @@ amdcompobj += xdr.o elogobj := elogobj := elogtool.o elogobj += eventlog.o -elogobj += uflashrom.o elogobj += valstr.o elogobj += elog.o elogobj += common.o @@ -147,12 +144,6 @@ else TOOLCFLAGS+=-std=c11 endif -.PHONY: check-flashrom-presence -check-flashrom-presence: - $(HOSTPKGCONFIG) --exists flashrom || \ - (echo "Error: Ensure that pkg-config and flashrom are installed."; exit 1) - -FLASHROM := $$($(HOSTPKGCONFIG) --libs flashrom) VBOOT_HOSTLIB = $(VBOOT_HOST_BUILD)/libvboot_host.a $(VBOOT_HOSTLIB): @@ -233,9 +224,9 @@ $(objutil)/cbfstool/amdcompress: $(addprefix $(objutil)/cbfstool/,$(amdcompobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" $(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(amdcompobj)) -lz -$(objutil)/cbfstool/elogtool: | check-flashrom-presence $(addprefix $(objutil)/cbfstool/,$(elogobj)) +$(objutil)/cbfstool/elogtool: $(addprefix $(objutil)/cbfstool/,$(elogobj)) $(VBOOT_HOSTLIB) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" - $(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(elogobj)) $(FLASHROM) + $(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(elogobj)) $(VBOOT_HOSTLIB) $(objutil)/cbfstool/cse_fpt: $(addprefix $(objutil)/cbfstool/,$(cse_fpt_obj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" |