diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-26 14:48:57 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-28 21:10:46 -0700 |
| commit | b53f7d912bd4630b2240f6755d7967c1859cb1cf (patch) | |
| tree | 4c69da13fab90be51c3bcab87bdc5ea5acf1ff6a /firmware/include/vboot_api.h | |
| parent | de2cae6b4d6ae864f2c90e6be73f683bad5f2f2f (diff) | |
| download | vboot-b53f7d912bd4630b2240f6755d7967c1859cb1cf.tar.gz | |
vboot: do not use cparams for VBSD
Pass VbSharedDataHeader struct directly as an argument for the
functions VbVerifyMemoryBootImage and VbSelectAndLoadKernel,
instead of retrieving from cparams. After any remaining
references are removed from depthcharge, the VbCommonParams
struct may be deprecated and removed.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I4dceb539516b62b5817987359705bb8e27ddb6f3
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1585505
Reviewed-on: https://chromium-review.googlesource.com/1584489
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/include/vboot_api.h')
| -rw-r--r-- | firmware/include/vboot_api.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 38c5cbda..84b9d11c 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -31,6 +31,7 @@ extern "C" { #endif /* __cplusplus */ struct vb2_context; +typedef struct VbSharedDataHeader VbSharedDataHeader; /*****************************************************************************/ /* Error codes */ @@ -321,7 +322,7 @@ typedef struct VbSelectAndLoadKernelParams { * Returns VBERROR_SUCCESS if success, non-zero if error; on error, caller * should reboot. */ VbError_t VbSelectAndLoadKernel(struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams); /** @@ -334,15 +335,14 @@ VbError_t VbSelectAndLoadKernel(struct vb2_context *ctx, * does not check the image signature. * * @param ctx Vboot context - * @param cparams Common parameters, e.g. use member caller_context - * to point to useful context data + * @param shared Vboot1 VBSD struct * @param kparams kernel params * @param boot_image Image in memory that needs to be verified * @param image_size Size of the image in memory * @return VBERROR_... error, VBERROR_SUCCESS on success. */ VbError_t VbVerifyMemoryBootImage(struct vb2_context *ctx, - VbCommonParams *cparams, + VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams, void *boot_image, size_t image_size); |