diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/2lib/include/2nvstorage.h | 2 | ||||
| -rw-r--r-- | firmware/2lib/include/2nvstorage_fields.h | 2 | ||||
| -rw-r--r-- | firmware/include/vboot_struct.h | 4 | ||||
| -rw-r--r-- | firmware/lib/include/rollback_index.h | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/firmware/2lib/include/2nvstorage.h b/firmware/2lib/include/2nvstorage.h index 36dbaa03..4b15c2aa 100644 --- a/firmware/2lib/include/2nvstorage.h +++ b/firmware/2lib/include/2nvstorage.h @@ -121,7 +121,7 @@ enum vb2_nv_param { VB2_NV_DEPRECATED_DISABLE_ALT_OS_REQUEST, /* * Add a short delay after EC software sync for any interaction - * with EC-RW (persistent). Currently used on eve for programmatically + * with EC-RW (persistent). Formerly used for programmatically * testing Alt OS booting. */ VB2_NV_POST_EC_SYNC_DELAY, diff --git a/firmware/2lib/include/2nvstorage_fields.h b/firmware/2lib/include/2nvstorage_fields.h index c9641407..ce24c6a4 100644 --- a/firmware/2lib/include/2nvstorage_fields.h +++ b/firmware/2lib/include/2nvstorage_fields.h @@ -107,8 +107,6 @@ enum vb2_nv_offset { #define VB2_NV_MISC_BOOT_ON_AC_DETECT 0x02 #define VB2_NV_MISC_TRY_RO_SYNC 0x04 #define VB2_NV_MISC_BATTERY_CUTOFF 0x08 -#define VB2_NV_MISC_DEPRECATED_ENABLE_ALT_OS 0x10 -#define VB2_NV_MISC_DEPRECATED_DISABLE_ALT_OS 0x20 #define VB2_NV_MISC_POST_EC_SYNC_DELAY 0x40 #endif /* VBOOT_REFERENCE_2NVSTORAGE_FIELDS_H_ */ diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 6e16c910..60a2edd2 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -250,10 +250,6 @@ 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_DEPRECATED_ALT_OS_CONFIRM_ENABLE 0x00200000 -/* Show Alt OS picker screen for this boot */ -#define VBSD_DEPRECATED_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 4836063e..cfa7a265 100644 --- a/firmware/lib/include/rollback_index.h +++ b/firmware/lib/include/rollback_index.h @@ -41,10 +41,8 @@ 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[2]; + uint8_t reserved[3]; /* Checksum (v2 and later only) */ uint8_t crc8; } __attribute__((packed)) RollbackSpaceKernel; |