summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2015-06-20 14:17:42 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-23 20:41:30 +0000
commitf843871cd5cc071ce1f6c15e8f1fd8036edc423b (patch)
treeac8dd04ac511064a8275a2788497c53dfa0df203
parent1eb83efdba367db2a590eb94a0cc45cd538aa696 (diff)
downloadvboot-stabilize-7204.B.tar.gz
recovery: Add recovery reason for fastboot mode requested in fwstabilize-7204.B
BUG=chrome-os-partner:40196 BRANCH=None TEST=Compiles successfully Change-Id: Ic69834f2e23926e618349b5a56db549a290cd0c2 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://chromium-review.googlesource.com/280922 Trybot-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Queue: Furquan Shaikh <furquan@chromium.org>
-rw-r--r--firmware/2lib/include/2recovery_reasons.h3
-rw-r--r--firmware/include/vboot_nvstorage.h2
-rw-r--r--firmware/lib/vboot_display.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/firmware/2lib/include/2recovery_reasons.h b/firmware/2lib/include/2recovery_reasons.h
index 7bc1f278..ee5c3e3a 100644
--- a/firmware/2lib/include/2recovery_reasons.h
+++ b/firmware/2lib/include/2recovery_reasons.h
@@ -199,6 +199,9 @@ enum vb2_nv_recovery {
/* Secure data inititalization error */
VB2_RECOVERY_SECDATAK_INIT = 0x5d,
+ /* Fastboot mode requested in firmware */
+ VB2_RECOVERY_FW_FASTBOOT = 0x5e,
+
/* Unspecified/unknown error in rewritable firmware */
VB2_RECOVERY_RW_UNSPECIFIED = 0x7f,
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h
index 665a5e5d..8a8da1c7 100644
--- a/firmware/include/vboot_nvstorage.h
+++ b/firmware/include/vboot_nvstorage.h
@@ -252,6 +252,8 @@ typedef enum VbFwResult {
#define VBNV_RECOVERY_RW_NO_KERNEL 0x5B
/* BCB-related error in RW firmware */
#define VBNV_RECOVERY_RW_BCB_ERROR 0x5C
+/* Fastboot mode requested in firmware */
+#define VBNV_RECOVERY_FW_FASTBOOT 0x5E
/* Unspecified/unknown error in rewritable firmware */
#define VBNV_RECOVERY_RW_UNSPECIFIED 0x7F
/* DM-verity error */
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 838ffc4f..c3cc6361 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -486,6 +486,8 @@ const char *RecoveryReasonString(uint8_t code)
return "No bootable kernel found on disk";
case VBNV_RECOVERY_RW_BCB_ERROR:
return "BCB partition error on disk";
+ case VBNV_RECOVERY_FW_FASTBOOT:
+ return "Fastboot-mode requested in firmware";
case VBNV_RECOVERY_RW_UNSPECIFIED:
return "Unspecified/unknown error in RW firmware";
case VBNV_RECOVERY_KE_DM_VERITY: