summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2021-07-15 06:07:05 +0800
committerCommit Bot <commit-bot@chromium.org>2021-07-19 09:21:07 +0000
commite33704be83614838400368ce5853becab9b88f4f (patch)
tree3a20f14dbcddc7f43510e68fcf7a9593262971ee
parent43325cb9b2568c4a03c849f3474fcee8de3ae893 (diff)
downloadvboot-e33704be83614838400368ce5853becab9b88f4f.tar.gz
vboot/crossystem: remove "vboot2" annotations
vboot 1 is deprecated, so remove "vboot2" annotations in crossystem help text. BUG=none TEST=make clean && make runtests BRANCH=none Signed-off-by: Joel Kitching <kitching@google.com> Change-Id: Ic46576b34d3f1ea611d574e5566479b8d29c1e81 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3028643 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--utility/crossystem.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/utility/crossystem.c b/utility/crossystem.c
index 079bf322..e5774ac2 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -52,12 +52,12 @@ const Param sys_param_list[] = {
{"ecfw_act", IS_STRING, "Active EC firmware"},
{"post_ec_sync_delay", CAN_WRITE,
"Short delay after EC software sync (persistent, writable, eve only)"},
- {"fw_prev_result", IS_STRING, "Firmware result of previous boot (vboot2)"},
- {"fw_prev_tried", IS_STRING, "Firmware tried on previous boot (vboot2)"},
- {"fw_result", IS_STRING|CAN_WRITE, "Firmware result this boot (vboot2)"},
- {"fw_tried", IS_STRING, "Firmware tried this boot (vboot2)"},
+ {"fw_prev_result", IS_STRING, "Firmware result of previous boot"},
+ {"fw_prev_tried", IS_STRING, "Firmware tried on previous boot"},
+ {"fw_result", IS_STRING|CAN_WRITE, "Firmware result this boot"},
+ {"fw_tried", IS_STRING, "Firmware tried this boot"},
{"fw_try_count", CAN_WRITE, "Number of times to try fw_try_next"},
- {"fw_try_next", IS_STRING|CAN_WRITE, "Firmware to try next (vboot2)"},
+ {"fw_try_next", IS_STRING|CAN_WRITE, "Firmware to try next"},
{"fw_vboot2", 0, "1 if firmware was selected by vboot2 or 0 otherwise"},
{"fwb_tries", CAN_WRITE, "Try firmware B count"},
{"fwid", IS_STRING, "Active firmware ID"},
@@ -86,7 +86,7 @@ const Param sys_param_list[] = {
{"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"},
- {"tpm_rebooted", 0, "TPM requesting repeated reboot (vboot2)"},
+ {"tpm_rebooted", 0, "TPM requesting repeated reboot"},
{"tried_fwb", 0, "Tried firmware B before A this boot"},
{"try_ro_sync", 0, "try read only software sync"},
{"vdat_flags", 0, "Flags from VbSharedData", "0x%08x"},