From 2f2c08204c31f8762a3cba043729ae2d5dc6c69b Mon Sep 17 00:00:00 2001 From: Ting Shen Date: Mon, 13 Aug 2018 15:48:08 +0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/1172237 Tested-by: Ting Shen Reviewed-by: Hung-Te Lin Commit-Queue: Hung-Te Lin --- firmware/include/vboot_struct.h | 8 ++++++-- 1 file 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 -- cgit v1.2.1