| Index: utility/crossystem_main.c
|
| diff --git a/utility/crossystem_main.c b/utility/crossystem_main.c
|
| index 4cf875a84f452a9c07401a0441aea5de40b76ef8..14b7e2269461c4af4ed06a3dda25ffa2ecff7659 100644
|
| --- a/utility/crossystem_main.c
|
| +++ b/utility/crossystem_main.c
|
| @@ -29,49 +29,45 @@ typedef struct Param {
|
|
|
| /* List of parameters, terminated with a param with NULL name */
|
| const Param sys_param_list[] = {
|
| - /* Read-only integers */
|
| - {"devsw_cur", 0, "Developer switch current position"},
|
| + {"arch", IS_STRING, "Platform architecture"},
|
| + {"cros_debug", 0, "OS should allow debug features"},
|
| + {"dbg_reset", CAN_WRITE, "Debug reset mode request (writable)"},
|
| {"devsw_boot", 0, "Developer switch position at boot"},
|
| - {"recoverysw_cur", 0, "Recovery switch current position"},
|
| - {"recoverysw_boot", 0, "Recovery switch position at boot"},
|
| - {"recoverysw_ec_boot", 0, "Recovery switch position at EC boot"},
|
| - {"wpsw_cur", 0, "Firmware write protect hardware switch current position"},
|
| - {"wpsw_boot", 0, "Firmware write protect hardware switch position at boot"},
|
| - {"recovery_reason", 0, "Recovery mode reason for current boot"},
|
| - {"savedmem_base", 0, "RAM debug data area physical address", "0x%08x"},
|
| - {"savedmem_size", 0, "RAM debug data area size in bytes"},
|
| + {"devsw_cur", 0, "Developer switch current position"},
|
| + {"ecfw_act", IS_STRING, "Active EC firmware"},
|
| {"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"},
|
| - {"tried_fwb", 0, "Tried firmware B before A this boot"},
|
| - {"cros_debug", 0, "OS should allow debug features"},
|
| - {"vdat_flags", 0, "Flags from VbSharedData", "0x%08x"},
|
| - {"tpm_fwver", 0, "Firmware version stored in TPM", "0x%08x"},
|
| - {"tpm_kernver", 0, "Kernel version stored in TPM", "0x%08x"},
|
| - /* Read-only strings */
|
| - {"arch", IS_STRING, "Platform architecture"},
|
| - {"hwid", IS_STRING, "Hardware ID"},
|
| + {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
|
| {"fwid", IS_STRING, "Active firmware ID"},
|
| - {"ro_fwid", IS_STRING, "Read-only firmware ID"},
|
| + {"fwupdate_tries", CAN_WRITE,
|
| + "Times to try OS firmware update (writable, inside kern_nv)"},
|
| + {"hwid", IS_STRING, "Hardware ID"},
|
| + {"kern_nv", CAN_WRITE, "Non-volatile field for kernel use", "0x%08x"},
|
| + {"kernkey_vfy", IS_STRING, "Type of verification done on kernel key block"},
|
| + {"loc_idx", CAN_WRITE, "Localization index for firmware screens (writable)"},
|
| {"mainfw_act", IS_STRING, "Active main firmware"},
|
| {"mainfw_type", IS_STRING, "Active main firmware type"},
|
| - {"ecfw_act", IS_STRING, "Active EC firmware"},
|
| - {"kernkey_vfy", IS_STRING, "Type of verification done on kernel key block"},
|
| - {"vdat_timers", IS_STRING, "Timer values from VbSharedData"},
|
| - /* Writable integers */
|
| {"nvram_cleared", CAN_WRITE, "Have NV settings been lost? Write 0 to clear"},
|
| - {"kern_nv", CAN_WRITE, "Non-volatile field for kernel use", "0x%08x"},
|
| + {"recovery_reason", 0, "Recovery mode reason for current boot"},
|
| {"recovery_request", CAN_WRITE, "Recovery mode request (writable)"},
|
| - {"dbg_reset", CAN_WRITE, "Debug reset mode request (writable)"},
|
| - {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
|
| - {"fwupdate_tries", CAN_WRITE,
|
| - "Times to try OS firmware update (writable, inside kern_nv)"},
|
| + {"recoverysw_boot", 0, "Recovery switch position at boot"},
|
| + {"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"},
|
| + {"savedmem_base", 0, "RAM debug data area physical address", "0x%08x"},
|
| + {"savedmem_size", 0, "RAM debug data area size in bytes"},
|
| + {"tpm_fwver", 0, "Firmware version stored in TPM", "0x%08x"},
|
| + {"tpm_kernver", 0, "Kernel version stored in TPM", "0x%08x"},
|
| + {"tried_fwb", 0, "Tried firmware B before A this boot"},
|
| {"vbtest_errfunc", CAN_WRITE, "Verified boot test error function (writable)"},
|
| {"vbtest_errno", CAN_WRITE, "Verified boot test error number (writable)"},
|
| - {"loc_idx", CAN_WRITE, "Localization index for firmware screens (writable)"},
|
| - /* Fields not shown in a print-all list */
|
| + {"vdat_flags", 0, "Flags from VbSharedData", "0x%08x"},
|
| {"vdat_lfdebug", IS_STRING|NO_PRINT_ALL,
|
| "LoadFirmware() debug data (not in print-all)"},
|
| {"vdat_lkdebug", IS_STRING|NO_PRINT_ALL,
|
| "LoadKernel() debug data (not in print-all)"},
|
| + {"vdat_timers", IS_STRING, "Timer values from VbSharedData"},
|
| + {"wpsw_boot", 0, "Firmware write protect hardware switch position at boot"},
|
| + {"wpsw_cur", 0, "Firmware write protect hardware switch current position"},
|
| /* Terminate with null name */
|
| {NULL, 0, NULL}
|
| };
|
|
|