scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 10:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot: Add multiboot kernel type

Browse Source 
Add a kernel type for signing multiboot kernel images.

BUG=b:38040849
BRANCH=none
TEST=properly sign a multiboot kernel image and then verify
the resulting image.

Change-Id: If00e7c85244bc59853c305e42543f34c5fabf356
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://chromium-review.googlesource.com/497933
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Duncan Laurie
2017-05-05 15:50:32 -07:00
committed by chrome-bot
parent eab2668a1a
commit 42f57403ae
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/include/vboot_struct.h
View File

@@ -176,7 +176,9 @@ typedef struct VbKernelPreambleHeader {
* Flags passed in by the signer. Readers should return 0 for header * Flags passed in by the signer. Readers should return 0 for header
* version < 2.2. Flags field is currently defined as: * version < 2.2. Flags field is currently defined as:
* [31:2] - Reserved (for future use) * [31:2] - Reserved (for future use)
* [1:0] - Kernel image type (0b00 - CrOS, 0b01 - bootimg) * [1:0] - Kernel image type (0b00 - CrOS,
* 0b01 - bootimg,
* 0b10 - multiboot)
*/ */
uint32_t flags; uint32_t flags;
} __attribute__((packed)) VbKernelPreambleHeader; } __attribute__((packed)) VbKernelPreambleHeader;

3
firmware/lib20/include/vb2_struct.h
View File

@@ -194,7 +194,8 @@ struct vb2_fw_preamble {
#define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_MASK 0x00000003 #define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_MASK 0x00000003
#define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_CROS 0 #define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_CROS 0
#define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_BOOTIMG 1 #define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_BOOTIMG 1
/* Kernel types 2,3 are reserved for future use */ #define VB2_KERNEL_PREAMBLE_KERNEL_TYPE_MULTIBOOT 2
/* Kernel type 3 is reserved for future use */
/* /*
* Preamble block for kernel, version 2.2 * Preamble block for kernel, version 2.2