From 552c1759b5d64e2843755e51ca5ea3961f2cfb7a Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Tue, 30 Apr 2019 16:18:41 +0800 Subject: vboot: deprecate Alt OS code BUG=b:124141368, b:131663912 TEST=make clean && make runtests BRANCH=none Change-Id: I6aae5683b8306eede4388ff5ed6665e7769756dc Signed-off-by: Joel Kitching Reviewed-on: https://chromium-review.googlesource.com/1588026 Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: Joel Kitching Reviewed-by: Julius Werner Reviewed-by: Ting Shen --- host/lib/crossystem.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'host/lib/crossystem.c') diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 34ac9724..994d4796 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -570,17 +570,8 @@ int VbGetSystemPropertyInt(const char *name) } else { value = 0; } - } else if (!strcasecmp(name, "enable_alt_os_request")) { - value = vb2_get_nv_storage(VB2_NV_ENABLE_ALT_OS_REQUEST); - } else if (!strcasecmp(name, "disable_alt_os_request")) { - value = vb2_get_nv_storage(VB2_NV_DISABLE_ALT_OS_REQUEST); } else if (!strcasecmp(name, "post_ec_sync_delay")) { value = vb2_get_nv_storage(VB2_NV_POST_EC_SYNC_DELAY); - } else if (!strcasecmp(name, "alt_os_enabled")) { - /* TODO(b/117195332): Change this to read from a field - * dedicated to storing Alt OS state. */ - value = !!(GetVdatInt(VDAT_INT_FLAGS) - & VBSD_ALT_OS_SHOW_PICKER); } return value; @@ -739,10 +730,6 @@ int VbSetSystemPropertyInt(const char *name, int value) return vb2_set_nv_storage(VB2_NV_BATTERY_CUTOFF_REQUEST, value); } else if (!strcasecmp(name,"kernel_max_rollforward")) { return vb2_set_nv_storage(VB2_NV_KERNEL_MAX_ROLLFORWARD, value); - } else if (!strcasecmp(name, "enable_alt_os_request")) { - return vb2_set_nv_storage(VB2_NV_ENABLE_ALT_OS_REQUEST, value); - } else if (!strcasecmp(name, "disable_alt_os_request")) { - return vb2_set_nv_storage(VB2_NV_DISABLE_ALT_OS_REQUEST, value); } else if (!strcasecmp(name, "post_ec_sync_delay")) { return vb2_set_nv_storage(VB2_NV_POST_EC_SYNC_DELAY, value); } -- cgit v1.2.1