diff options
| author | Ting Shen <phoenixshen@google.com> | 2018-08-13 15:48:08 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-08-13 08:06:09 +0000 |
| commit | 2f2c08204c31f8762a3cba043729ae2d5dc6c69b (patch) | |
| tree | e584be51870c3781b08565b90be1072ba6afa1c3 | |
| parent | 6afc9fc7c8df2474dffe37d92b8dcbfb3a3cb407 (diff) | |
| download | vboot-2f2c08204c31f8762a3cba043729ae2d5dc6c69b.tar.gz | |
vboot_reference: sync VBSD flags with ToT
VBSD_ALT_OS flags conflicts with ToT. Change the conflicted values.
BUG=b:112520234
TEST=make runtests
BRANCH=eve-campfire
Change-Id: I84a5eb22fc0d8e6c46d7a8487a852f2e28c0507f
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1172237
Tested-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | firmware/include/vboot_struct.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index f005feb3..0478a1d1 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -241,10 +241,14 @@ typedef struct VbKernelPreambleHeader { #define VBSD_OPROM_LOADED 0x00020000 /* Don't try for boot failures */ #define VBSD_NOFAIL_BOOT 0x00040000 +/* VbInit() was told that the EC firmware supports EFS */ +#define VBSD_EC_EFS 0x00080000 +/* 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 0x00080000 +#define VBSD_ALT_OS_CONFIRM_ENABLE 0x00200000 /* Show Alt OS picker screen for this boot */ -#define VBSD_ALT_OS_SHOW_PICKER 0x00100000 +#define VBSD_ALT_OS_SHOW_PICKER 0x00400000 /* * Supported flags by header version. It's ok to add new flags while keeping |