diff options
| author | Joel Kitching <kitching@google.com> | 2020-07-26 14:26:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-29 22:17:56 +0000 |
| commit | bc9f971e406619cf0e4f489866d0e38b2bb1264f (patch) | |
| tree | 036e2930274b69f198caed3fa8ec00f9a1b35212 | |
| parent | 699189d29bd5385ee36621940c9256f8921e31f4 (diff) | |
| download | vboot-bc9f971e406619cf0e4f489866d0e38b2bb1264f.tar.gz | |
vboot: disallow DIAGNOSTIC_UI with MENU_UI
DIAGNOSTIC_UI is incompatible with the new menu_ui ("Groot").
Disallow diagnostic UI under the condition of using MENU_UI.
BUG=b:146399181, b:160748354
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Idc09e37a72d355baf7fa42ade7cdfecb3d41eabb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2319415
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 2bc31845..500d3725 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -240,7 +240,8 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, } else { VB2_TRY(VbBootRecoveryLegacyClamshell(ctx)); } - } else if (DIAGNOSTIC_UI && vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST)) { + } else if (DIAGNOSTIC_UI && !MENU_UI && + vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST)) { vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 0); /* |