crossystem: Remove defunct sw_wpsw_boot field
The sw_wpsw_boot field only ever worked correctly on some platforms. It
also isn't used anywhere in the codebase (only other reference is a
comment about how it doesn't always work in factory_installer.sh), and
it's no longer clear what it was meant for in the first place
(b/35510092 hints at needing it for some planned feature that was never
implemented). Let's get rid of it to avoid confusing people.
If userspace tools need to know the software write-protect state, they
can instead run flashrom directly. For feedback reports, this output is
already included in the "verified boot" section.
BRANCH=none
BUG=chromium:508269,chromium:742685
TEST=none
Change-Id: I8975b1e2c8e604b4cb48d092c13b923b4db2d207
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/575389
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c
index f122183..16ba211 100644
--- a/host/lib/crossystem.c
+++ b/host/lib/crossystem.c
@@ -49,7 +49,6 @@
VDAT_INT_DEVSW_VIRTUAL, /* Dev switch is virtual */
VDAT_INT_RECSW_BOOT, /* Recovery switch position at boot */
VDAT_INT_HW_WPSW_BOOT, /* Hardware WP switch position at boot */
- VDAT_INT_SW_WPSW_BOOT, /* Flash chip's WP setting at boot */
VDAT_INT_FW_VERSION_TPM, /* Current firmware version in TPM */
VDAT_INT_KERNEL_VERSION_TPM, /* Current kernel version in TPM */
@@ -440,11 +439,6 @@
value = (sh->flags &
VBSD_BOOT_FIRMWARE_WP_ENABLED ? 1 : 0);
break;
- case VDAT_INT_SW_WPSW_BOOT:
- value = (sh->flags &
- VBSD_BOOT_FIRMWARE_SW_WP_ENABLED ?
- 1 : 0);
- break;
case VDAT_INT_RECOVERY_REASON:
value = sh->recovery_reason;
break;
@@ -543,8 +537,6 @@
value = GetVdatInt(VDAT_INT_RECSW_BOOT);
} else if (!strcasecmp(name, "wpsw_boot")) {
value = GetVdatInt(VDAT_INT_HW_WPSW_BOOT);
- } else if (!strcasecmp(name, "sw_wpsw_boot")) {
- value = GetVdatInt(VDAT_INT_SW_WPSW_BOOT);
} else if (!strcasecmp(name,"vdat_flags")) {
value = GetVdatInt(VDAT_INT_FLAGS);
} else if (!strcasecmp(name,"tpm_fwver")) {
diff --git a/utility/crossystem.c b/utility/crossystem.c
index a0be1d8..9303b3d 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -86,8 +86,6 @@
{"recoverysw_cur", 0, "Recovery switch current position"},
{"recoverysw_ec_boot", 0, "Recovery switch position at EC boot"},
{"ro_fwid", IS_STRING, "Read-only firmware ID"},
- {"sw_wpsw_boot", 0,
- "Firmware write protect software setting enabled at boot (Baytrail only)"},
{"tpm_attack", CAN_WRITE, "TPM was interrupted since this flag was cleared"},
{"tpm_fwver", 0, "Firmware version stored in TPM", "0x%08x"},
{"tpm_kernver", 0, "Kernel version stored in TPM", "0x%08x"},
