diff options
| author | Joel Kitching <kitching@google.com> | 2019-03-18 16:46:39 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:43:29 -0700 |
| commit | f9a2fa1f589acf1e436b6a494e647d0e4305fc2b (patch) | |
| tree | 7a4fbf6bde58c17bd93fa81fc93903a382013980 | |
| parent | 06a65e7f3b6a8b5d4f3d8c91ca2447ba399c77d2 (diff) | |
| download | vboot-f9a2fa1f589acf1e436b6a494e647d0e4305fc2b.tar.gz | |
vboot/crossystem: deprecate devsw_virtual
As part of chromium:942901, physical dev switch functionality
is being deprecated.
There is no longer any need to provide devsw_virtual flag
in crossystem.
BUG=b:124141368, b:124192753, chromium:942901
TEST=Build locally
TEST=/work/vboot/src/repohooks/pre-upload.py
TEST=make clean && make runtests
TEST=make clean && COV=1 make coverage && make coverage_html
TEST=Check for references to devsw_virtual in code search
BRANCH=none
Change-Id: Id80ec1de8c43909ce2ff661744622d2ea36030a6
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1526069
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | host/lib/crossystem.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index e64e0acc..08b481d7 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -49,7 +49,8 @@ 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_DEVSW_VIRTUAL, /* Dev switch is virtual */ + 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 */ @@ -420,10 +421,6 @@ int GetVdatInt(VdatIntField field) value = (sh->flags & VBSD_BOOT_DEV_SWITCH_ON ? 1 : 0); break; - case VDAT_INT_DEVSW_VIRTUAL: - value = (sh->flags & - VBSD_HONOR_VIRT_DEV_SWITCH ? 1 : 0); - break; case VDAT_INT_RECSW_BOOT: value = (sh->flags & VBSD_BOOT_REC_SWITCH_ON ? 1 : 0); @@ -533,8 +530,6 @@ int VbGetSystemPropertyInt(const char *name) value = VbGetDebugBuild(); } else if (!strcasecmp(name,"devsw_boot")) { value = GetVdatInt(VDAT_INT_DEVSW_BOOT); - } else if (!strcasecmp(name,"devsw_virtual")) { - value = GetVdatInt(VDAT_INT_DEVSW_VIRTUAL); } else if (!strcasecmp(name, "recoverysw_boot")) { value = GetVdatInt(VDAT_INT_RECSW_BOOT); } else if (!strcasecmp(name, "recoverysw_is_virtual")) { |