summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2015-08-18 21:19:28 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-10-08 18:42:31 -0700
commitf29dbbcbd5c47161389541b9889ae5e88a336586 (patch)
tree614fdb2ec039d5743e5418dfa734a6885b21a1f0
parentdabb158ad27610661ef16639843e2909f2a3dba5 (diff)
downloadvboot-f29dbbcbd5c47161389541b9889ae5e88a336586.tar.gz
recovery: Add recovery reason for fastboot mode requested in
user-mode. BUG=chrome-os-partner:42674 BRANCH=None TEST=Compiles successfully and behavior verified. Change-Id: I67ec056f28596dd0c0005a54e454abe1b4104cfb Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://chromium-review.googlesource.com/294276 Trybot-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Commit-Queue: Furquan Shaikh <furquan@chromium.org> (cherry picked from commit 6d9a9a9fdd3bcdadbfc4f44640da4c462803a69d) Reviewed-on: https://chromium-review.googlesource.com/304673 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Randall Spangler <rspangler@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 ee5c3e3a..13685e62 100644
--- a/firmware/2lib/include/2recovery_reasons.h
+++ b/firmware/2lib/include/2recovery_reasons.h
@@ -217,6 +217,9 @@ enum vb2_nv_recovery {
/* Recovery requested by user-mode via BCB */
VB2_RECOVERY_BCB_USER_MODE = 0xc2,
+ /* Fastboot mode requested by user-mode */
+ VB2_RECOVERY_US_FASTBOOT = 0xc3,
+
/* Unspecified/unknown error in user-mode */
VB2_RECOVERY_US_UNSPECIFIED = 0xff,
};
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h
index d3070d93..5a44ae14 100644
--- a/firmware/include/vboot_nvstorage.h
+++ b/firmware/include/vboot_nvstorage.h
@@ -268,6 +268,8 @@ typedef enum VbFwResult {
#define VBNV_RECOVERY_US_TEST 0xC1
/* Recovery requested by user-mode via BCB */
#define VBNV_RECOVERY_BCB_USER_MODE 0xC2
+/* Fastboot mode requested by user-mode */
+#define VBNV_RECOVERY_US_FASTBOOT 0xC3
/* Unspecified/unknown error in user-mode */
#define VBNV_RECOVERY_US_UNSPECIFIED 0xFF
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index c3cc6361..edcb3ebf 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -498,6 +498,8 @@ const char *RecoveryReasonString(uint8_t code)
return "Recovery mode test from user-mode";
case VBNV_RECOVERY_BCB_USER_MODE:
return "User-mode requested recovery via BCB";
+ case VBNV_RECOVERY_US_FASTBOOT:
+ return "User-mode requested fastboot mode";
case VBNV_RECOVERY_US_UNSPECIFIED:
return "Unspecified/unknown error in user-mode";
}