summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-05-07 13:21:03 +0800
committerchrome-bot <chrome-bot@chromium.org>2019-05-29 01:15:02 -0700
commitb00d3fd7adab63fb6372fb4c9e363615eda994d1 (patch)
tree8a60ec39f76fe79fd51c774978aab1ab0443c12f
parentb41fce8325bf1e5c696df70104b373daf989933b (diff)
downloadvboot-stabilize-12239.19.B.tar.gz
vboot: deprecate and remove VbInitParamsstabilize-12249.Bstabilize-12239.19.B
Keep VB_INIT_OUT_* constants which are still currently used by vboot_handoff.out_flags. They can be removed once vboot_handoff has been completely sunsetted. BUG=b:124141368, chromium:960226 TEST=make clean && make runtests BRANCH=none Change-Id: I8bf2d3330a09c971fd26406737a656b4b3221779 Signed-off-by: Joel Kitching <kitching@google.com> Cq-Depend: chromium:1599565, chromium:1598588 Reviewed-on: https://chromium-review.googlesource.com/1597369 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Joel Kitching <kitching@chromium.org> Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--firmware/include/vboot_api.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index 84b9d11c..ef5ca278 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -213,7 +213,7 @@ typedef struct VbCommonParams {
/*
- * Output flags for VbInitParams.out_flags. Used to indicate potential boot
+ * Output flags for vboot_handoff.out_flags. Used to indicate potential boot
* paths and configuration to the calling firmware early in the boot process,
* so that it can properly configure itself for the capabilities subsequently
* required by VbSelectFirmware() and VbSelectAndLoadKernel().
@@ -230,25 +230,9 @@ typedef struct VbCommonParams {
* is not present, VbExDisplay*() functions will not be called this boot.
*/
#define VB_INIT_OUT_ENABLE_DISPLAY 0x00000004
-/*
- * Load USB storage drivers; VbExDisk*() functions may be called with the
- * VB_DISK_FLAG_REMOVABLE flag. If this flag is not present, VbExDisk*()
- * functions will only be called for fixed disks.
- */
-#define VB_INIT_OUT_ENABLE_USB_STORAGE 0x00000008
/* Enable developer path. */
#define VB_INIT_OUT_ENABLE_DEVELOPER 0x00000080
-/* Mask of deprecated flags */
-#define VB_INIT_OUT_DEPRECATED 0x00000070
-
-/* Data only used by VbInit() */
-typedef struct VbInitParams {
- uint32_t deprecated; /* Was init flags */
- /* Outputs from VbInit(); valid only if it returns success. */
- /* Output flags for firmware; see VB_INIT_OUT_*) */
- uint32_t out_flags;
-} VbInitParams;
/*
* Firmware types for VbHashFirmwareBody() and