summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/include/vboot_api.h4
-rw-r--r--firmware/include/vboot_struct.h4
-rw-r--r--firmware/lib/include/rollback_index.h4
3 files changed, 11 insertions, 1 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index 73e2706d..55c3d02a 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -132,6 +132,8 @@ enum VbErrorPredefined_t {
VBERROR_TPM_READ_FWMP = 0x10029,
/* Peripheral busy. Cannot upgrade firmware at present. */
VBERROR_PERIPHERAL_BUSY = 0x10030,
+ /* Error reading or writing Alt OS flags to TPM */
+ VBERROR_TPM_ALT_OS = 0x10031,
/* VbExEcGetExpectedRWHash() may return the following codes */
/* Compute expected RW hash from the EC image; BIOS doesn't have it */
@@ -659,6 +661,8 @@ enum VbScreenType_t {
VB_SCREEN_LANGUAGES_MENU = 0x20f,
/* Detachable Menu - Options */
VB_SCREEN_OPTIONS_MENU = 0x210,
+ /* Alt OS picker screen */
+ VB_SCREEN_ALT_OS = 0x211,
};
/**
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h
index fd5777a2..c1afd8cd 100644
--- a/firmware/include/vboot_struct.h
+++ b/firmware/include/vboot_struct.h
@@ -248,6 +248,10 @@ typedef struct VbKernelPreambleHeader {
#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 0x00200000
+/* Show Alt OS picker screen for this boot */
+#define VBSD_ALT_OS_SHOW_PICKER 0x00400000
/*
* Supported flags by header version. It's ok to add new flags while keeping
diff --git a/firmware/lib/include/rollback_index.h b/firmware/lib/include/rollback_index.h
index f8905987..ff369114 100644
--- a/firmware/lib/include/rollback_index.h
+++ b/firmware/lib/include/rollback_index.h
@@ -40,8 +40,10 @@ typedef struct RollbackSpaceKernel {
uint32_t uid;
/* Kernel versions */
uint32_t kernel_versions;
+ /* Flags for Alt OS mode */
+ uint8_t alt_os_flags;
/* Reserved for future expansion */
- uint8_t reserved[3];
+ uint8_t reserved[2];
/* Checksum (v2 and later only) */
uint8_t crc8;
} __attribute__((packed)) RollbackSpaceKernel;