summaryrefslogtreecommitdiff
path: root/firmware/2lib/2nvstorage.c
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2018-04-12 15:36:59 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-08-07 01:51:13 -0700
commit935d60e8374f0d73123a5dedf0f1c144c3249820 (patch)
treebe03f872e2ed8fae51b9a954580b6f9846ee6a3d /firmware/2lib/2nvstorage.c
parent9ad8a41b8cedef9ac1f0513992ce6958eb86c257 (diff)
downloadvboot-935d60e8374f0d73123a5dedf0f1c144c3249820.tar.gz
Add AltOS NVRAM flags
Port CL:1009444 to ToT. Adds (enable|disable)_alt_os_request flag for AltOS boot flow. BRANCH=none BUG=b:70804764 TEST=1. make runtests 2. Manually, set and get new flags via crossystem Change-Id: Ie7fe2620f736335f11c39cbfe37b3fdf400ff926 Reviewed-on: https://chromium-review.googlesource.com/1014840 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Ting Shen <phoenixshen@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'firmware/2lib/2nvstorage.c')
-rw-r--r--firmware/2lib/2nvstorage.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/firmware/2lib/2nvstorage.c b/firmware/2lib/2nvstorage.c
index 9090608d..e721ca6a 100644
--- a/firmware/2lib/2nvstorage.c
+++ b/firmware/2lib/2nvstorage.c
@@ -218,6 +218,10 @@ uint32_t vb2_nv_get(struct vb2_context *ctx, enum vb2_nv_param param)
| (p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD2] << 8)
| (p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD3] << 16)
| (p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD4] << 24));
+ case VB2_NV_ENABLE_ALT_OS_REQUEST:
+ return GETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_ENABLE_ALT_OS);
+ case VB2_NV_DISABLE_ALT_OS_REQUEST:
+ return GETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_DISABLE_ALT_OS);
}
/*
@@ -419,6 +423,12 @@ void vb2_nv_set(struct vb2_context *ctx,
p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD3] = (uint8_t)(value >> 16);
p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD4] = (uint8_t)(value >> 24);
break;
+ case VB2_NV_ENABLE_ALT_OS_REQUEST:
+ SETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_ENABLE_ALT_OS);
+ break;
+ case VB2_NV_DISABLE_ALT_OS_REQUEST:
+ SETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_DISABLE_ALT_OS);
+ break;
}
/*