diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-05-13 10:31:14 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-14 08:03:00 +0000 |
| commit | 92cb5fa717d99e9e2972b02541e0ad925dd35bae (patch) | |
| tree | f555757fe1f1fb69935fb7dbd5c6a7ceb3af1b2e | |
| parent | d6c392bb12b6d52d880b72b24d68e59ad8e8d609 (diff) | |
| download | vboot-92cb5fa717d99e9e2972b02541e0ad925dd35bae.tar.gz | |
vboot: enable phone recovery
Enable the phone recovery functionality and UI.
BRANCH=none
BUG=b:153596126
TEST=make runtests
Change-Id: If4fc29db44903e79cecd959a9b558c509ad19e1a
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2196093
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/2kernel.c | 4 | ||||
| -rw-r--r-- | tests/vb2_kernel_tests.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/2lib/2kernel.c b/firmware/2lib/2kernel.c index 23563205..3155d189 100644 --- a/firmware/2lib/2kernel.c +++ b/firmware/2lib/2kernel.c @@ -143,9 +143,9 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) return rv; } - /* Disable phone recovery */ + /* Enable phone recovery */ secdata_flags = vb2_secdata_kernel_get(ctx, VB2_SECDATA_KERNEL_FLAGS); - secdata_flags |= VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_DISABLED; + secdata_flags &= ~VB2_SECDATA_KERNEL_FLAG_PHONE_RECOVERY_DISABLED; vb2_secdata_kernel_set(ctx, VB2_SECDATA_KERNEL_FLAGS, secdata_flags); /* Read kernel version from secdata. */ diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index 30da9ad5..09ef7067 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -213,9 +213,9 @@ static void phase1_tests(void) " key data"); TEST_EQ(sd->kernel_version_secdata, 0x20002, " secdata_kernel version"); - /* Make sure phone recovery is disabled */ - TEST_EQ(vb2api_phone_recovery_enabled(ctx), 0, - " phone recovery disabled"); + /* Make sure phone recovery is enabled */ + TEST_EQ(vb2api_phone_recovery_enabled(ctx), 1, + " phone recovery enabled"); /* Bad secdata_fwmp causes failure in normal mode only */ reset_common_data(FOR_PHASE1); |