diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-20 11:10:12 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-28 18:40:56 +0000 |
| commit | 090279951f8cd0f23bf38c4fb72c2b1f3a465ddf (patch) | |
| tree | 8d9859231ccc424ffc7292faa35bd09aec33432a | |
| parent | 708524f4c8cf09109eb71efa1bead137d2d4f995 (diff) | |
| download | vboot-090279951f8cd0f23bf38c4fb72c2b1f3a465ddf.tar.gz | |
vboot: remove more Alt OS code
BUG=b:124141368, b:131663912, b:139392536
TEST=make clean && make runtests
BRANCH=none
Change-Id: I91eab08130786188b0a7c514b35574c611863b03
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1758147
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -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 | ||||
| -rw-r--r-- | utility/crossystem.c | 5 |
5 files changed, 2 insertions, 15 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; diff --git a/utility/crossystem.c b/utility/crossystem.c index 00846a67..a799bf16 100644 --- a/utility/crossystem.c +++ b/utility/crossystem.c @@ -47,15 +47,10 @@ const Param sys_param_list[] = { {"devsw_boot", 0, "Developer switch position at boot"}, {"devsw_cur", 0, "Developer switch current position"}, {"diagnostic_request", CAN_WRITE, "Request diagnostic rom run on next boot"}, - {"disable_alt_os_request", CAN_WRITE, - "Disable Alt OS mode on next boot (writable)"}, {"disable_dev_request", CAN_WRITE, "Disable virtual dev-mode on next boot"}, {"ecfw_act", IS_STRING, "Active EC firmware"}, - {"enable_alt_os_request", CAN_WRITE, - "Enable Alt OS mode on next boot (writable)"}, {"post_ec_sync_delay", CAN_WRITE, "Short delay after EC software sync (persistent, writable, eve only)"}, - {"alt_os_enabled", 0, "Alt OS state (1 if enabled, 0 if disabled)"}, {"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"}, {"fw_prev_result", IS_STRING, "Firmware result of previous boot (vboot2)"}, {"fw_prev_tried", IS_STRING, "Firmware tried on previous boot (vboot2)"}, |