diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2019-11-25 16:40:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-03 04:10:37 +0000 |
| commit | d3095bf4def33da46320bd6b25b253850682dced (patch) | |
| tree | 8b14511b2d48663ed4405c0f2a89303fdeea690f | |
| parent | 0ca8cda82a5870e971c91340138cce9415464513 (diff) | |
| download | vboot-d3095bf4def33da46320bd6b25b253850682dced.tar.gz | |
Remove inflags from VbSelectAndLoadKernelParams
Since vendor data flag in vb2_context is set from depthcharge directly
(CL:1933685), VB_SALK_INFLAGS_VENDOR_DATA_SETTABLE can be removed. The
inflags field is also removed from struct VbSelectAndLoadKernelParams.
BRANCH=none
BUG=chromium:953656
TEST=emerge-kukui depthcharge vboot_reference
Cq-Depend: chromium:1933685
Change-Id: If5cdf11d1fd27603b22b2c71183847a0987e5fc8
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1932279
Reviewed-by: Joel Kitching <kitching@chromium.org>
(cherry picked from commit 45facd54087232ef3f354108e8429932e6f0355f)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1947714
Reviewed-by: Shelley Chen <shchen@chromium.org>
Commit-Queue: Shelley Chen <shchen@chromium.org>
Tested-by: Shelley Chen <shchen@chromium.org>
| -rw-r--r-- | firmware/include/vboot_api.h | 7 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index fb191bf6..5481c379 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -105,8 +105,6 @@ typedef struct VbSelectAndLoadKernelParams { void *kernel_buffer; /* Size of kernel buffer in bytes */ uint32_t kernel_buffer_size; - /* input flags. */ - uint32_t inflags; /* * Outputs from VbSelectAndLoadKernel(); valid only if it returns @@ -132,11 +130,6 @@ typedef struct VbSelectAndLoadKernelParams { */ } VbSelectAndLoadKernelParams; -/* Flag to indicate that the vendor data is not set and the vendor data - * UI should be enabled. - */ -#define VB_SALK_INFLAGS_VENDOR_DATA_SETTABLE (1 << 1) - /** * Select and loads the kernel. * diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 7567010f..5408c5a3 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -429,9 +429,6 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, if (!rv) rv = VBERROR_REBOOT_REQUIRED; } else if (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE) { - if (kparams->inflags & VB_SALK_INFLAGS_VENDOR_DATA_SETTABLE) - ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; - /* Developer boot. This has UI. */ if (ctx->flags & VB2_CONTEXT_DETACHABLE_UI) rv = VbBootDeveloperMenu(ctx); |