diff options
| author | Nikolai Artemiev <nartemiev@google.com> | 2022-01-14 17:09:42 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-18 22:50:50 +0000 |
| commit | 8d0107d9ba0d7cecebe3da7e7138b0fec9ae6abe (patch) | |
| tree | 6e3458bdbd6a13d05d07dde625b15b9e36c0f439 /Makefile | |
| parent | 3654f9f96d150de9af3597d860c6eb2138ab8e6d (diff) | |
| download | vboot-release-R98-14388.B.tar.gz | |
Revert "vboot_reference/futility: Port W path to using libflashrom"stabilize-14388.62.Bstabilize-14388.61.Bstabilize-14388.52.Brelease-R98-14388.B
This reverts commit 483dff64346fd30224df5b66bf76124aeea7bb12.
Changing the write path in futility to use libflashrom had the side
effect of skipping the code in cli_classic that created a powerd lock
file. This could result in powerd suspending during a firmware update,
corrupting the RW firmware.
Revert back to subprocessing flashrom for M98.
BUG=b:214485250
BRANCH=release-R98-14388.B
TEST=emerge-grunt vboot_reference
TEST=flashed grunt DUT with R98-14388.30.0 test image, deployed \
vboot_reference with reverts
TEST=ran `futility --force -i image.bin`, monitored processes \
with `ps -ef | grep flashrom` verified that flashrom ran as \
a separate process for read/wp-status/write ops
TEST=verified /run/lock/power_override/flashrom.lock was created \
during update
TEST=ran `futility --force -i image.bin --wp=0`, verified only RW \
sections A/B were written
TEST=ran `futility --force -i image.bin`, waited for write to start, \
sent restart msg with: `dbus-send --type=method_call --system \
--dest=org.chromium.PowerManager /org/chromium/PowerManager \
org.chromium.PowerManager.RequestRestart`, verified restart was \
deferred until firmware write finished
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Change-Id: I81ba6e45aa926d7ff930d280d2f4a5ef31c59fa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3388976
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -284,8 +284,6 @@ ifneq ($(filter-out 0,${HAVE_LIBZIP}),) LIBZIP_LIBS := $(shell ${PKG_CONFIG} --libs libzip) endif -FLASHROM_LIBS := $(shell ${PKG_CONFIG} --libs flashrom) - # Determine QEMU architecture needed, if any ifeq (${ARCH},${HOST_ARCH}) # Same architecture; no need for QEMU @@ -1029,7 +1027,7 @@ signing_install: $(if ${SDK_BUILD},\ futil: ${FUTIL_BIN} # FUTIL_LIBS is shared by FUTIL_BIN and TEST_FUTIL_BINS. -FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${FLASHROM_LIBS} +FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS} ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB} |