diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-01-16 16:43:38 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-06 16:21:42 +0000 |
| commit | ab8a4d48cb54dd69dc7ca6cf7a377d30eaafc6a3 (patch) | |
| tree | 8196c8125328343a09821cfb1ce204a855cbf77f | |
| parent | 4d7cb7a4ef37db1e1622382221286e14ce4cefbe (diff) | |
| download | vboot-ab8a4d48cb54dd69dc7ca6cf7a377d30eaafc6a3.tar.gz | |
vboot/crossystem: Deprecate recoverysw_is_virtual
As part of chromium:943150, virtual recovery switch functionality is
being deprecated. Physical presence should be chosen by specifying one
of the following USE flags:
- physical_presence_keyboard
- physical_presence_recovery
- physical_presence_power
Fields VDAT_INT_DEPRECATED_DEVSW_VIRTUAL and VDAT_INT_RECSW_VIRTUAL are
also removed from VdatIntField.
BRANCH=none
BUG=chromium:943150
TEST=make runtests
Cq-Depend: chromium:2004370
Change-Id: I4342a2607538d1b4480d601073eb531e93e74b38
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2037268
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | host/lib/crossystem.c | 9 | ||||
| -rw-r--r-- | utility/crossystem.c | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 3c429bba..71cdd5c9 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -39,10 +39,7 @@ typedef enum VdatIntField { VDAT_INT_FLAGS = 0, /* Flags */ VDAT_INT_HEADER_VERSION, /* Header version for VbSharedData */ VDAT_INT_DEVSW_BOOT, /* Dev switch position at boot */ - VDAT_INT_DEPRECATED_DEVSW_VIRTUAL, /* Dev switch is virtual; - * deprecated: chromium:942901 */ VDAT_INT_RECSW_BOOT, /* Recovery switch position at boot */ - VDAT_INT_RECSW_VIRTUAL, /* Recovery switch is virtual */ VDAT_INT_HW_WPSW_BOOT, /* Hardware WP switch position at boot */ VDAT_INT_FW_VERSION_TPM, /* Current firmware version in TPM */ @@ -429,10 +426,6 @@ static int GetVdatInt(VdatIntField field) value = (sh->flags & VBSD_BOOT_REC_SWITCH_ON ? 1 : 0); break; - case VDAT_INT_RECSW_VIRTUAL: - value = (sh->flags & - VBSD_BOOT_REC_SWITCH_VIRTUAL ? 1 : 0); - break; case VDAT_INT_HW_WPSW_BOOT: value = (sh->flags & VBSD_BOOT_FIRMWARE_WP_ENABLED ? 1 : 0); @@ -534,8 +527,6 @@ int VbGetSystemPropertyInt(const char *name) value = GetVdatInt(VDAT_INT_DEVSW_BOOT); } else if (!strcasecmp(name, "recoverysw_boot")) { value = GetVdatInt(VDAT_INT_RECSW_BOOT); - } else if (!strcasecmp(name, "recoverysw_is_virtual")) { - value = GetVdatInt(VDAT_INT_RECSW_VIRTUAL); } else if (!strcasecmp(name, "wpsw_boot")) { value = GetVdatInt(VDAT_INT_HW_WPSW_BOOT); } else if (!strcasecmp(name,"vdat_flags")) { diff --git a/utility/crossystem.c b/utility/crossystem.c index f3f901b8..d5f48835 100644 --- a/utility/crossystem.c +++ b/utility/crossystem.c @@ -82,7 +82,6 @@ const Param sys_param_list[] = { {"recoverysw_boot", 0, "Recovery switch position at boot"}, {"recoverysw_cur", 0, "Recovery switch current position"}, {"recoverysw_ec_boot", 0, "Recovery switch position at EC boot"}, - {"recoverysw_is_virtual", 0, "Recovery switch is virtual"}, {"ro_fwid", IS_STRING, "Read-only firmware ID"}, {"tpm_attack", CAN_WRITE, "TPM was interrupted since this flag was cleared"}, {"tpm_fwver", 0, "Firmware version stored in TPM", "0x%08x"}, |