summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2018-09-11 00:35:33 -0400
committerchrome-bot <chrome-bot@chromium.org>2018-09-13 06:14:09 -0700
commit2f52ccad33f72927bf5beee2b484da8325eec062 (patch)
treeeb56560966ab83808f39a64a2c845719b8db56bd
parentebc8bb5fc79a0c3244df8650f162c3a94b62d0f7 (diff)
downloadvboot-2f52ccad33f72927bf5beee2b484da8325eec062.tar.gz
crossystem: resort param list
A bunch of these fields are slightly missorted. BUG=None TEST=`crossystem` is sorted BRANCH=None Change-Id: I9e90343f5034e7a8a2d81c9b8eeb4b1d7286f157 Reviewed-on: https://chromium-review.googlesource.com/1218503 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--utility/crossystem.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/utility/crossystem.c b/utility/crossystem.c
index 1d12cb09..64b7a973 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -37,17 +37,17 @@ const Param sys_param_list[] = {
{"battery_cutoff_request", CAN_WRITE,
"Cut off battery and shutdown on next boot."},
{"block_devmode", CAN_WRITE, "Block all use of developer mode"},
- {"clear_tpm_owner_request", CAN_WRITE, "Clear TPM owner on next boot"},
{"clear_tpm_owner_done", CAN_WRITE, "Clear TPM owner done"},
+ {"clear_tpm_owner_request", CAN_WRITE, "Clear TPM owner on next boot"},
{"cros_debug", 0, "OS should allow debug features"},
{"dbg_reset", CAN_WRITE, "Debug reset mode request (writable)"},
{"debug_build", 0, "OS image built for debug features"},
- {"dev_boot_usb", CAN_WRITE,
- "Enable developer mode boot from USB/SD (writable)"},
{"dev_boot_legacy", CAN_WRITE,
"Enable developer mode boot Legacy OSes (writable)"},
{"dev_boot_signed_only", CAN_WRITE,
"Enable developer mode boot only from official kernels (writable)"},
+ {"dev_boot_usb", CAN_WRITE,
+ "Enable developer mode boot from USB/SD (writable)"},
{"dev_default_boot", IS_STRING|CAN_WRITE,
"default boot from disk, legacy or usb (writable)"},
{"dev_enable_udc", CAN_WRITE, "Enable USB Device Controller"},
@@ -60,19 +60,19 @@ const Param sys_param_list[] = {
{"enable_alt_os_request", CAN_WRITE,
"Enable AltOS mode on next boot (writable)"},
{"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"},
- {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
- {"fw_vboot2", 0, "1 if firmware was selected by vboot2 or 0 otherwise"},
- {"fwid", IS_STRING, "Active firmware ID"},
- {"fwupdate_tries", CAN_WRITE,
- "Times to try OS firmware update (writable, inside kern_nv)"},
+ {"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,writable)"},
{"fw_tried", IS_STRING, "Firmware tried this boot (vboot2)"},
{"fw_try_count", CAN_WRITE, "Number of times to try fw_try_next (writable)"},
{"fw_try_next", IS_STRING|CAN_WRITE,
"Firmware to try next (vboot2,writable)"},
- {"fw_result", IS_STRING|CAN_WRITE,
- "Firmware result this boot (vboot2,writable)"},
- {"fw_prev_tried", IS_STRING, "Firmware tried on previous boot (vboot2)"},
- {"fw_prev_result", IS_STRING, "Firmware result of previous boot (vboot2)"},
+ {"fw_vboot2", 0, "1 if firmware was selected by vboot2 or 0 otherwise"},
+ {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
+ {"fwid", IS_STRING, "Active firmware ID"},
+ {"fwupdate_tries", CAN_WRITE,
+ "Times to try OS firmware update (writable, inside kern_nv)"},
{"hwid", IS_STRING, "Hardware ID"},
{"inside_vm", 0, "Running in a VM?"},
{"kern_nv", 0, "Non-volatile field for kernel use", "0x%04x"},
@@ -98,8 +98,8 @@ const Param sys_param_list[] = {
{"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)"},
- {"try_ro_sync", 0, "try read only software sync"},
{"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"},
{"vdat_lfdebug", IS_STRING|NO_PRINT_ALL,
"LoadFirmware() debug data (not in print-all)"},