From 774dcffc369989b70595e27dc96ee191bd48e34f Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 6 Jun 2022 20:01:04 +1000 Subject: util/cbfstool: Decouple elogtool from vboot_ref flashrom code Currently elogtool sub-proccesses flashrom as calling libflashrom requires a missing function from the previous flashrom release. Pending a new release of flashrom we must continue to use subprocess. However the current subprocess wrapper implementation lives in vboot_reference which is a git sub-module of coreboot. This causes all sorts of grief keeping a subprocess ABI stable from vboot_reference when the rest of vboot_reference builds of HEAD of the flashrom tree (i.e., using unreleased libflashrom functions). In order to not keep finding ourseleves in a bind between the two separately moving trees with different build environments, decouple elogtool with its own mini copy of flashrom subprocess wrapping logic. Squash in, util/cbfstool/elogtool.c: Convert args into struct in flashrom helper vboot signatures for flashrom r/w helpers changed in the upstream commit bd2971326ee94fc5. Reflect the change here to allow vboot ref and coreboot to realign. BUG=b:207808292,b:231152447 TEST=builds with vboot_ref uprev. Change-Id: I04925e4d9a44b52e4a6fb6f9cec332cab2c7c725 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/coreboot/+/65055 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- util/cbfstool/Makefile.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'util/cbfstool/Makefile.inc') diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index f3e6c75dced2..7b2d75d2bb05 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -95,6 +95,7 @@ elogobj += eventlog.o elogobj += valstr.o elogobj += elog.o elogobj += common.o +elogobj += flashrom.o include $(top)/util/cbfstool/fpt_formats/Makefile.inc cse_fpt_obj := -- cgit v1.2.3