summaryrefslogtreecommitdiff
path: root/utility
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2014-06-24 15:31:04 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-28 00:56:17 +0000
commit9e1da784487fb8cfbe4e76693e07205b66675bda (patch)
tree9beada3e8c3667c27765702708b537aaa76d5062 /utility
parentd11086caf05c692815ae6f90aa83a4fc30d50ed7 (diff)
downloadvboot-9e1da784487fb8cfbe4e76693e07205b66675bda.tar.gz
Add nvstorage / crossystem support for new vboot2 fields
This allows testing vboot2. These fields are ignored by original vboot firmware. BUG=chromium:370082 BRANCH=none TEST=manual crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=A crossystem fw_tried=B echo $? -> 1 crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=A crossystem fw_try_next=B crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=B crossystem fw_try_next=beats_me echo $? -> 1 crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=B crossystem fw_try_next=A crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=A crossystem fw_result=trying crossystem -> fw_tried=A, fw_result=trying, fw_try_next=A crossystem fw_result=bupkis echo $? -> 1 crossystem -> fw_tried=A, fw_result=trying, fw_try_next=A crossystem fw_result=success crossystem -> fw_tried=A, fw_result=success, fw_try_next=A crossystem fw_result=failure crossystem -> fw_tried=A, fw_result=failure, fw_try_next=A crossystem fw_result=unknown crossystem -> fw_tried=A, fw_result=unknown, fw_try_next=A crossystem -> fw_try_count = 0, fwb_tries = 0 crossystem fw_try_count=6 crossystem -> fw_try_count = 6, fwb_tries = 6 crossystem fwb_tries=0 crossystem -> fw_try_count = 0, fwb_tries = 0 Change-Id: I1532f3384f8c05de2a7ff3f35abcc35d18049491 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/205475
Diffstat (limited to 'utility')
-rw-r--r--utility/crossystem.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/utility/crossystem.c b/utility/crossystem.c
index 6b16ff40..5251f7d7 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -57,6 +57,12 @@ const Param sys_param_list[] = {
{"fwid", IS_STRING, "Active firmware ID"},
{"fwupdate_tries", CAN_WRITE,
"Times to try OS firmware update (writable, inside kern_nv)"},
+ {"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)"},
{"hwid", IS_STRING, "Hardware ID"},
{"kern_nv", 0, "Non-volatile field for kernel use", "0x%08x"},
{"kernkey_vfy", IS_STRING, "Type of verification done on kernel key block"},