diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-30 16:18:41 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-14 20:13:17 -0700 |
| commit | 552c1759b5d64e2843755e51ca5ea3961f2cfb7a (patch) | |
| tree | 1fa008a949aebea6ed39420afd9f2c8ec10ed2f8 /firmware/include | |
| parent | 52fa8c11f8e5217e17da74c04e8ad1e5aee9ff40 (diff) | |
| download | vboot-552c1759b5d64e2843755e51ca5ea3961f2cfb7a.tar.gz | |
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 <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1588026
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/vboot_api.h | 5 | ||||
| -rw-r--r-- | firmware/include/vboot_struct.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 66e26ef0..682e7fc5 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -139,7 +139,7 @@ enum VbErrorPredefined_t { /* Peripheral busy. Cannot upgrade firmware at present. */ VBERROR_PERIPHERAL_BUSY = 0x10030, /* Error reading or writing Alt OS flags to TPM */ - VBERROR_TPM_ALT_OS = 0x10031, + VBERROR_DEPRECATED_TPM_ALT_OS = 0x10031, /* Error writing VPD */ VBERROR_VPD_WRITE = 0x10032, @@ -682,8 +682,7 @@ enum VbScreenType_t { VB_SCREEN_LANGUAGES_MENU = 0x20f, /* Detachable Menu - Options */ VB_SCREEN_OPTIONS_MENU = 0x210, - /* Alt OS picker screen */ - VB_SCREEN_ALT_OS = 0x211, + /* REMOVED: Alt OS picker screen (0x211) */ /* Alt firmware picker screen (for keyboard UI) */ VB_SCREEN_ALT_FW_PICK = 0x212, /* Alt firmware menu screen (for detachable UI ) */ diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index a4c5bedd..9c8a3587 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -254,9 +254,9 @@ typedef struct VbKernelPreambleHeader { /* NvStorage uses 64-byte record, not 16-byte */ #define VBSD_NVDATA_V2 0x00100000 /* Confirm enabling Alt OS for this boot */ -#define VBSD_ALT_OS_CONFIRM_ENABLE 0x00200000 +#define VBSD_DEPRECATED_ALT_OS_CONFIRM_ENABLE 0x00200000 /* Show Alt OS picker screen for this boot */ -#define VBSD_ALT_OS_SHOW_PICKER 0x00400000 +#define VBSD_DEPRECATED_ALT_OS_SHOW_PICKER 0x00400000 /* * Supported flags by header version. It's ok to add new flags while keeping |