diff options
Diffstat (limited to 'firmware/lib/vboot_api_kernel.c')
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index a910b552..e2d14310 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -230,30 +230,16 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, VB2_DEBUG("NO_BOOT in RECOVERY mode\n"); /* Recovery boot. This has UI. */ - if (MENU_UI) { - if (vb2_allow_recovery(ctx)) - VB2_TRY(vb2_manual_recovery_menu(ctx)); - else - VB2_TRY(vb2_broken_recovery_menu(ctx)); - } else if (LEGACY_MENU_UI) { - VB2_TRY(VbBootRecoveryLegacyMenu(ctx)); - } else { - VB2_TRY(VbBootRecoveryLegacyClamshell(ctx)); - } + if (vb2_allow_recovery(ctx)) + VB2_TRY(vb2_manual_recovery_menu(ctx)); + else + VB2_TRY(vb2_broken_recovery_menu(ctx)); } else if (DIAGNOSTIC_UI && vb2api_diagnostic_ui_enabled(ctx) && vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST)) { vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 0); /* Diagnostic boot. This has UI. */ - if (MENU_UI) - VB2_TRY(vb2_diagnostic_menu(ctx)); - else - /* - * Only power button is used for input so no - * detachable-specific UI is needed. This mode is also - * 1-shot so it's placed before developer mode. - */ - VB2_TRY(VbBootDiagnosticLegacyClamshell(ctx)); + VB2_TRY(vb2_diagnostic_menu(ctx)); /* * The diagnostic menu should either boot a rom, or * return either of reboot or shutdown. @@ -261,12 +247,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, return VB2_REQUEST_REBOOT; } else if (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE) { /* Developer boot. This has UI. */ - if (MENU_UI) - VB2_TRY(vb2_developer_menu(ctx)); - else if (LEGACY_MENU_UI) - VB2_TRY(VbBootDeveloperLegacyMenu(ctx)); - else - VB2_TRY(VbBootDeveloperLegacyClamshell(ctx)); + VB2_TRY(vb2_developer_menu(ctx)); } else { /* Normal boot */ VB2_TRY(vb2_normal_boot(ctx)); |