diff options
| author | Joel Kitching <kitching@google.com> | 2020-02-20 16:43:11 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-27 17:25:16 +0000 |
| commit | 8f4737628e96b7547b4166c700b218dafb0c5349 (patch) | |
| tree | adadcb08573bd794832d3b21c3f636f632f975c6 /futility | |
| parent | 5abb36eae300851d7bae05784cfac306ad881254 (diff) | |
| download | vboot-8f4737628e96b7547b4166c700b218dafb0c5349.tar.gz | |
vboot: stop using wpsw_boot and remove it from crossystem
wpsw_boot is being deprecated, so just use wpsw_cur.
BUG=b:124141368, chromium:950273
TEST=make clean && make runtests
BRANCH=none
Change-Id: Iae63b2a76b19629a9ecd9b87e5dd6367767860b3
Cq-Depend: chromium:2066154, chromium:2068241, chromium:2068209
Cq-Depend: chromium:2068297, chromium:2067229, chromium:2067231
Cq-Depend: chromium:2068242
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2066192
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/updater_utils.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/futility/updater_utils.c b/futility/updater_utils.c index 36ea7981..4ef7a26e 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -417,13 +417,7 @@ static int host_get_tpm_fwver(void) static int host_get_wp_hw(void) { /* wpsw refers to write protection 'switch', not 'software'. */ - int v = VbGetSystemPropertyInt("wpsw_cur"); - - /* wpsw_cur may be not available, especially in recovery mode. */ - if (v < 0) - v = VbGetSystemPropertyInt("wpsw_boot"); - - return v; + return VbGetSystemPropertyInt("wpsw_cur"); } /* A helper function to return "fw_vboot2" system property. */ |