diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-04 14:59:54 +0800 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2019-11-07 03:24:06 +0000 |
| commit | 9ebe3190380cf1bde64c923aa969af352773d5f1 (patch) | |
| tree | 25d4f0cdd91e48a301837f97dadbc4cce11f4b15 | |
| parent | 57bab83390b4f2dd677df4fd2eb4292fe74a6178 (diff) | |
| download | vboot-9ebe3190380cf1bde64c923aa969af352773d5f1.tar.gz | |
vboot: remove some more junk from vboot_struct.h
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: If322882e53aabb9e488a393a0053f16fcabd626c
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1839732
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
(cherry picked from commit 7a58d44d2b241a739bb5d10daca1ae5a98f92544)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1902833
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Auto-Submit: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | firmware/include/vboot_struct.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 5d633a3f..1451a1cf 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -258,14 +258,6 @@ typedef struct VbKernelPreambleHeader { /* NvStorage uses 64-byte record, not 16-byte */ #define VBSD_NVDATA_V2 0x00100000 -/* - * Supported flags by header version. It's ok to add new flags while keeping - * struct version 2 as long as flag-NOT-present is the correct value for - * existing hardware (Stumpy/Lumpy). - */ -#define VBSD_FLAGS_VERSION_1 0x00000007 /* Alex, ZGB */ -#define VBSD_FLAGS_VERSION_2 0x00000F7F - /* Result codes for VbSharedDataHeader.check_fw_a_result (and b_result) */ #define VBSD_LF_CHECK_NOT_DONE 0 #define VBSD_LF_CHECK_DEV_MISMATCH 1 @@ -334,10 +326,6 @@ typedef struct VbSharedDataKernelPart { /* Number of kernel partitions to track per call. Must be power of 2. */ #define VBSD_MAX_KERNEL_PARTS 8 -/* Flags for VbSharedDataKernelCall.flags */ -/* Error initializing TPM in recovery mode */ -#define VBSD_LK_FLAG_REC_TPM_INIT_ERROR 0x00000001 - /* Result codes for VbSharedDataKernelCall.check_result */ #define VBSD_LKC_CHECK_NOT_DONE 0 #define VBSD_LKC_CHECK_DEV_SWITCH_MISMATCH 1 @@ -489,16 +477,11 @@ typedef struct VbSharedDataHeader { */ } __attribute__((packed)) VbSharedDataHeader; -/* - * Size of VbSharedDataheader for each version - * - * TODO: crossystem needs not to fail if called on a v1 system where - * sizeof(VbSharedDataHeader) was smaller - */ +/* Size of VbSharedDataheader for each version */ #define VB_SHARED_DATA_HEADER_SIZE_V1 1072 #define VB_SHARED_DATA_HEADER_SIZE_V2 1096 -#define VB_SHARED_DATA_VERSION 2 /* Version for struct_version */ +#define VB_SHARED_DATA_VERSION 2 /* Version for struct_version */ #ifdef __cplusplus } |