diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-01-02 16:58:41 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-09 09:31:52 +0000 |
| commit | 3270d9b5b3859065743e1248c85d17fde33423c6 (patch) | |
| tree | 1b23215bfbe51c84a4369781f71ac8bab5117574 | |
| parent | 5ea8fe68b1d9c498b6f58303afa3e36cf025d280 (diff) | |
| download | vboot-3270d9b5b3859065743e1248c85d17fde33423c6.tar.gz | |
vboot: Deprecate VBSD_EC_SLOW_UPDATE
Replace VbSharedDataHeader flag VBSD_EC_SLOW_UPDATE with compile-time
macro EC_SLOW_UPDATE.
BRANCH=none
BUG=chromium:1038259
TEST=FEATURES=test emerge-nami vboot_reference
Cq-Depend: chromium:1985549
Change-Id: I0f5e04f2b6cf088ab8373ade580bc294ba18e290
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1985547
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | firmware/include/vboot_struct.h | 5 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -190,6 +190,13 @@ else CFLAGS += -DUSB_BOOT_ON_DEV=0 endif +# EC software sync is slow to update. Enable warning screen display. +ifneq ($(filter-out 0,${EC_SLOW_UPDATE}),) +CFLAGS += -DEC_SLOW_UPDATE=1 +else +CFLAGS += -DEC_SLOW_UPDATE=0 +endif + # Some tests need to be disabled when using mocked_secdata_tpm. ifneq (${MOCK_TPM},) CFLAGS += -DMOCK_TPM diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 9ed80dd2..c63edb10 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -72,8 +72,9 @@ extern "C" { #define VBSD_DEPRECATED_HONOR_VIRT_DEV_SWITCH 0x00000400 /* VbInit() was told the system supports EC software sync */ #define VBSD_EC_SOFTWARE_SYNC 0x00000800 -/* VbInit() was told that the EC firmware is slow to update */ -#define VBSD_EC_SLOW_UPDATE 0x00001000 +/* VbInit() was told that the EC firmware is slow to update + Deprecated as part of chromium:1038259 */ +#define VBSD_DEPRECATED_EC_SLOW_UPDATE 0x00001000 /* Firmware software write protect was enabled at boot time. Crossystem support deprecated as part of CL:575389. */ #define VBSD_DEPRECATED_BOOT_FIRMWARE_SW_WP_ENABLED 0x00002000 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 565fc981..1e15e309 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -245,7 +245,7 @@ static vb2_error_t vb2_kernel_setup(struct vb2_context *ctx, */ if (shared->flags & VBSD_EC_SOFTWARE_SYNC) ctx->flags |= VB2_CONTEXT_EC_SYNC_SUPPORTED; - if (shared->flags & VBSD_EC_SLOW_UPDATE) + if (EC_SLOW_UPDATE) ctx->flags |= VB2_CONTEXT_EC_SYNC_SLOW; if (shared->flags & VBSD_EC_EFS) ctx->flags |= VB2_CONTEXT_EC_EFS; |