vboot: merge vb2_struct.h into 2struct.h

Also remove unused preamble structs in vboot_struct.h.

BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none

Change-Id: I8b41f24b55eba91b1f952415eda1b532732848eb
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1844601
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

1 files changed, 0 insertions, 97 deletions

diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h
index f92a37db..849d4b2f 100644
--- a/firmware/include/vboot_struct.h
+++ b/firmware/include/vboot_struct.h
@@ -23,103 +23,6 @@
 extern "C" {
 #endif  /* __cplusplus */
 
-#define KERNEL_PREAMBLE_HEADER_VERSION_MAJOR 2
-#define KERNEL_PREAMBLE_HEADER_VERSION_MINOR 2
-
-/* Preamble block for kernel, version 2.0
- *
- * This should be followed by:
- *   1) The signature data for the kernel body, pointed to by
- *      body_signature.sig_offset.
- *   2) The signature data for (vb2_kernel_preamble + body signature
- *      data), pointed to by preamble_signature.sig_offset.
- */
-typedef struct VbKernelPreambleHeader2_0 {
-	/*
-	 * Size of this preamble, including keys, signatures, and padding, in
-	 * bytes
-	 */
-	uint64_t preamble_size;
-	/* Signature for this preamble (header + body signature) */
-	struct vb2_signature preamble_signature;
-	/* Version of this header format */
-	uint32_t header_version_major;
-	/* Version of this header format */
-	uint32_t header_version_minor;
-
-	/* Kernel version */
-	uint64_t kernel_version;
-	/* Load address for kernel body */
-	uint64_t body_load_address;
-	/* Address of bootloader, after body is loaded at body_load_address */
-	uint64_t bootloader_address;
-	/* Size of bootloader in bytes */
-	uint64_t bootloader_size;
-	/* Signature for the kernel body */
-	struct vb2_signature body_signature;
-} __attribute__((packed)) VbKernelPreambleHeader2_0;
-
-#define EXPECTED_VBKERNELPREAMBLEHEADER2_0_SIZE 96
-
-/* Preamble block for kernel, version 2.1
- *
- * This should be followed by:
- *   1) The signature data for the kernel body, pointed to by
- *      body_signature.sig_offset.
- *   2) The signature data for (vb2_fw_preamble + body signature
- *      data), pointed to by preamble_signature.sig_offset.
- *   3) The 16-bit vmlinuz header, which is used for reconstruction of
- *      vmlinuz image.
- */
-typedef struct VbKernelPreambleHeader {
-	/*
-	 * Size of this preamble, including keys, signatures, vmlinuz header,
-	 * and padding, in bytes
-	 */
-	uint64_t preamble_size;
-	/* Signature for this preamble (header + body signature) */
-	struct vb2_signature preamble_signature;
-	/* Version of this header format */
-	uint32_t header_version_major;
-	/* Version of this header format */
-	uint32_t header_version_minor;
-
-	/* Kernel version */
-	uint64_t kernel_version;
-	/* Load address for kernel body */
-	uint64_t body_load_address;
-	/* Address of bootloader, after body is loaded at body_load_address */
-	uint64_t bootloader_address;
-	/* Size of bootloader in bytes */
-	uint64_t bootloader_size;
-	/* Signature for the kernel body */
-	struct vb2_signature body_signature;
-	/*
-	 * Fields added in header version 2.1.  You must verify the header
-	 * version before reading these fields!
-	 */
-	/* Address of 16-bit header for vmlinuz reassembly.  Readers should
-	   return 0 for header version < 2.1 */
-	uint64_t vmlinuz_header_address;
-	/* Size of 16-bit header for vmlinuz in bytes.  Readers should return 0
-	   for header version < 2.1 */
-	uint64_t vmlinuz_header_size;
-	/*
-	 * Flags passed in by the signer. Readers should return 0 for header
-	 * version < 2.2. Flags field is currently defined as:
-	 * [31:2] - Reserved (for future use)
-	 * [1:0]  - Kernel image type (0b00 - CrOS,
-	 *                             0b01 - bootimg,
-	 *                             0b10 - multiboot)
-	 */
-	uint32_t flags;
-} __attribute__((packed)) VbKernelPreambleHeader;
-
-#define EXPECTED_VBKERNELPREAMBLEHEADER2_1_SIZE 112
-#define EXPECTED_VBKERNELPREAMBLEHEADER2_2_SIZE 116
-
-/****************************************************************************/
-
 /* Constants and sub-structures for VbSharedDataHeader */
 
 /* Magic number for recognizing VbSharedDataHeader ("VbSD") */