diff options
| -rw-r--r-- | firmware/2lib/include/2api.h | 3 | ||||
| -rw-r--r-- | firmware/include/vboot_api.h | 5 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 43595c84..50ebc1bc 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -194,6 +194,9 @@ enum vb2_context_flags { * Caller should *not* set this when FWMP is available but invalid. */ VB2_CONTEXT_NO_SECDATA_FWMP = (1 << 21), + + /* Enable detachable menu ui (volume up/down + power). */ + VB2_CONTEXT_DETACHABLE_UI = (1 << 22), }; /* Helper for aligning fields in vb2_context. */ diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index f34f219b..fb191bf6 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -132,11 +132,6 @@ typedef struct VbSelectAndLoadKernelParams { */ } VbSelectAndLoadKernelParams; -/* Flag to indicate using detachable menu ui (arrow up/down+power) - * instead of traditional FW screens with ctrl+D, ctrl+U, etc. - */ -#define VB_SALK_INFLAGS_ENABLE_DETACHABLE_UI (1 << 0) - /* Flag to indicate that the vendor data is not set and the vendor data * UI should be enabled. */ diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index a2062ff3..7567010f 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -407,7 +407,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, /* Select boot path */ if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) { /* Recovery boot. This has UI. */ - if (kparams->inflags & VB_SALK_INFLAGS_ENABLE_DETACHABLE_UI) + if (ctx->flags & VB2_CONTEXT_DETACHABLE_UI) rv = VbBootRecoveryMenu(ctx); else rv = VbBootRecovery(ctx); @@ -433,7 +433,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; /* Developer boot. This has UI. */ - if (kparams->inflags & VB_SALK_INFLAGS_ENABLE_DETACHABLE_UI) + if (ctx->flags & VB2_CONTEXT_DETACHABLE_UI) rv = VbBootDeveloperMenu(ctx); else rv = VbBootDeveloper(ctx); |