diff options
| author | Meng-Huan Yu <menghuan@chromium.org> | 2021-01-08 19:18:53 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-18 05:30:28 +0000 |
| commit | 4919d96dae74ed8004a0e14933c54dbfdb28cc57 (patch) | |
| tree | 665752ec106d308a6e945ec0d6f431962fc246da | |
| parent | af02768dace900e7e62d6788b4ff81b57b3e0a79 (diff) | |
| download | vboot-4919d96dae74ed8004a0e14933c54dbfdb28cc57.tar.gz | |
Minidiag: Enable minidiag by default
This CL enabled the pre-boot diagnostic tools entry in recovery mode.
BRANCH=none
BUG=b:176947486
TEST=CQ
TEST=FEATURES=test P2_TEST_FILTER='*' emerge-zork vboot_reference
TEST=manually build, flash FW to device, and confirm minidiag works
Signed-off-by: Meng-Huan Yu <menghuan@chromium.org>
Change-Id: I8500cbaaa4e8d0f1aa668d56d38095ecdcf50aaf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2617391
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
(cherry picked from commit 6f6efdc6fa38ed3bcacfa9e152f415d50ee8bad0)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2677615
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Commit-Queue: Nick Vaccaro <nvaccaro@google.com>
| -rw-r--r-- | firmware/2lib/2kernel.c | 2 | ||||
| -rw-r--r-- | tests/vb2_kernel_tests.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/2lib/2kernel.c b/firmware/2lib/2kernel.c index 0fa1a6f4..8c6d191a 100644 --- a/firmware/2lib/2kernel.c +++ b/firmware/2lib/2kernel.c @@ -148,7 +148,7 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) flags = vb2_secdata_kernel_get(ctx, VB2_SECDATA_KERNEL_FLAGS); flags &= ~VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_DISABLED; flags |= VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_UI_DISABLED; - flags |= VB2_SECDATA_KERNEL_FLAG_DIAGNOSTIC_UI_DISABLED; + flags &= ~VB2_SECDATA_KERNEL_FLAG_DIAGNOSTIC_UI_DISABLED; flags |= VB2_SECDATA_KERNEL_FLAG_HWCRYPTO_ALLOWED; vb2_secdata_kernel_set(ctx, VB2_SECDATA_KERNEL_FLAGS, flags); } diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index 67b6b486..4b0a2494 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -223,9 +223,9 @@ static void phase1_tests(void) " phone recovery enabled"); TEST_EQ(vb2api_phone_recovery_ui_enabled(ctx), 0, " phone recovery ui disabled"); - /* Make sure diagnostic UI is disabled */ - TEST_EQ(vb2api_diagnostic_ui_enabled(ctx), 0, - " diagnostic ui disabled"); + /* Make sure diagnostic UI is enabled */ + TEST_EQ(vb2api_diagnostic_ui_enabled(ctx), 1, + " diagnostic ui enabled"); /* * Test flags are unchanged for experimental features in recovery path |