From e3e965b13d4806b47aca23a256823efe4319ef5f Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 25 Feb 2022 17:28:04 -0700 Subject: Revert "util/cbfstool: Port elogtool to libflashrom" 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 Change-Id: I572daa0c0f3998e20a8ed76df21228fdbb384baf Reviewed-on: https://review.coreboot.org/c/coreboot/+/62404 Reviewed-by: Nico Huber Reviewed-by: ron minnich Reviewed-by: Stefan Reinauer Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) --- util/cbfstool/Makefile.inc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'util/cbfstool/Makefile.inc') 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" -- cgit v1.2.3