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>
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 2bc3184..500d372 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -240,7 +240,8 @@
} 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);
/*
