mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-26 19:25:02 +00:00
firmware: Remove LoadKernelParams from APIs
This cleans up the vboot functions which handle display so they don't need to pass it around. Eventually, it'll be absorbed by vb2_context. BUG=chromium:611535 BRANCH=none TEST=make runtests; build_packages --board=reef chromeos-firmware; boot reef Change-Id: I58169dfd37abe657f9b9aa339cc72ffa398329e0 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/414288 Reviewed-by: Shelley Chen <shchen@chromium.org>
This commit is contained in:
committed by
chrome-bot
parent
284bf5549a
commit
ad7a75531e
@@ -60,6 +60,18 @@ int ec_will_update_slowly(struct vb2_context *ctx,
|
||||
VbError_t ec_sync_phase2(struct vb2_context *ctx,
|
||||
struct VbCommonParams *cparams);
|
||||
|
||||
|
||||
/**
|
||||
* EC sync, phase 3
|
||||
*
|
||||
* This completes EC sync and handles battery cutoff if needed.
|
||||
*
|
||||
* @param ctx Vboot2 context
|
||||
* @param cparams Vboot common params
|
||||
* @return VBERROR_SUCCESS or non-zero error code.
|
||||
*/
|
||||
VbError_t ec_sync_phase3(struct vb2_context *ctx, VbCommonParams *cparams);
|
||||
|
||||
/**
|
||||
* Sync all EC devices to expected versions.
|
||||
*
|
||||
|
||||
@@ -17,10 +17,6 @@ struct vb2_context;
|
||||
/* Interface provided by verified boot library to BDS */
|
||||
|
||||
/* Boot flags for LoadKernel().boot_flags */
|
||||
/* Developer switch is on */
|
||||
#define BOOT_FLAG_DEVELOPER (0x01ULL)
|
||||
/* In recovery mode */
|
||||
#define BOOT_FLAG_RECOVERY (0x02ULL)
|
||||
/* GPT is external */
|
||||
#define BOOT_FLAG_EXTERNAL_GPT (0x04ULL)
|
||||
|
||||
@@ -28,10 +24,6 @@ struct RollbackSpaceFwmp;
|
||||
|
||||
typedef struct LoadKernelParams {
|
||||
/* Inputs to LoadKernel() */
|
||||
/* Pointer to GBB data */
|
||||
void *gbb_data;
|
||||
/* Size of GBB data in bytes */
|
||||
uint64_t gbb_size;
|
||||
/* Disk handle for current device */
|
||||
VbExDiskHandle_t disk_handle;
|
||||
/* Bytes per lba sector on current device */
|
||||
|
||||
@@ -29,13 +29,11 @@ void VbApiKernelFree(VbCommonParams *cparams);
|
||||
*
|
||||
* @param ctx Vboot context
|
||||
* @param cparams Vboot common params
|
||||
* @param p Parameters for loading kernel
|
||||
* @param get_info_flags Flags to pass to VbExDiskGetInfo()
|
||||
* @return VBERROR_SUCCESS, VBERROR_NO_DISK_FOUND if no disks of the specified
|
||||
* type were found, or other non-zero VBERROR_ codes for other failures.
|
||||
*/
|
||||
uint32_t VbTryLoadKernel(struct vb2_context *ctx, VbCommonParams *cparams,
|
||||
LoadKernelParams *p,
|
||||
uint32_t get_info_flags);
|
||||
|
||||
/* Flags for VbUserConfirms() */
|
||||
@@ -62,19 +60,16 @@ int VbUserConfirms(struct vb2_context *ctx, VbCommonParams *cparams,
|
||||
/**
|
||||
* Handle a normal boot.
|
||||
*/
|
||||
VbError_t VbBootNormal(struct vb2_context *ctx, VbCommonParams *cparams,
|
||||
LoadKernelParams *p);
|
||||
VbError_t VbBootNormal(struct vb2_context *ctx, VbCommonParams *cparams);
|
||||
|
||||
/**
|
||||
* Handle a developer-mode boot.
|
||||
*/
|
||||
VbError_t VbBootDeveloper(struct vb2_context *ctx, VbCommonParams *cparams,
|
||||
LoadKernelParams *p);
|
||||
VbError_t VbBootDeveloper(struct vb2_context *ctx, VbCommonParams *cparams);
|
||||
|
||||
/**
|
||||
* Handle a recovery-mode boot.
|
||||
*/
|
||||
VbError_t VbBootRecovery(struct vb2_context *ctx, VbCommonParams *cparams,
|
||||
LoadKernelParams *p);
|
||||
VbError_t VbBootRecovery(struct vb2_context *ctx, VbCommonParams *cparams);
|
||||
|
||||
#endif /* VBOOT_REFERENCE_VBOOT_KERNEL_H_ */
|
||||
|
||||
Reference in New Issue
Block a user