summaryrefslogtreecommitdiff
path: root/utility
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2018-10-02 20:54:07 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-11-19 16:28:25 -0800
commit0f7779862ca4b4973f52c7b851c65ccb8d9cd147 (patch)
tree36e2c16888c1f4c8f50c95c0a5dce732390879b1 /utility
parent9071205452595027cc8d52588f0c6fdf7581f905 (diff)
downloadvboot-0f7779862ca4b4973f52c7b851c65ccb8d9cd147.tar.gz
CHERRY-PICK: vboot: create NVRAM flag to pause after EC software sync
Previously, it is impossible to programmatically enable/disable Alt OS mode in eve. This is because only EC-RW supports the kbatboot keyboard matrix functionality. But, as part of the campfire boot flow, the keyboard matrix is retrieved *immediately* after jumping into EC-RW. We need to insert a small pause in order to allow for some entity (autotest/servo) to send a kbatboot command, simulating the Alt OS keyboard press hotkey. BUG=b:117140648,b:118786884 TEST=Manually use crossystem to set post_ec_sync_delay=1 Reboot, and wait for the delay to begin Run `kbatboot 1 4 1` in EC console Check that AP console contains: "vb2_post_ec_sync_hooks: post_ec_sync_delay 5000 ms..." TEST=make clean && make runtests Note that we are only cherry-picking the changes which affect crossystem in this CL. Firmware changes will still live in campfire-eve branch only. Change-Id: I1305357199d87b80b4edc4e311015106ab07de65 Reviewed-on: https://chromium-review.googlesource.com/c/1256644 Commit-Queue: Joel Kitching <kitching@chromium.org> Tested-by: Joel Kitching <kitching@chromium.org> Trybot-Ready: Joel Kitching <kitching@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> (cherry picked from commit 64d7369976b88b21d8d8a860252023776a2f119e) Reviewed-on: https://chromium-review.googlesource.com/1328389 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r--utility/crossystem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/utility/crossystem.c b/utility/crossystem.c
index 4ab5d7f3..d7443487 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -55,6 +55,8 @@ const Param sys_param_list[] = {
{"disable_dev_request", CAN_WRITE, "Disable virtual dev-mode on next boot"},
{"ecfw_act", IS_STRING, "Active EC firmware"},
{"enable_alt_os_request", CAN_WRITE, "Enable AltOS mode on next boot"},
+ {"post_ec_sync_delay", CAN_WRITE,
+ "Short delay after EC software sync (persistent, writable, eve only)"},
{"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"},
{"fw_prev_result", IS_STRING, "Firmware result of previous boot (vboot2)"},
{"fw_prev_tried", IS_STRING, "Firmware tried on previous boot (vboot2)"},