diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-04-10 08:54:05 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-28 08:11:14 +0000 |
| commit | 3aab301473ec0b95f109a245efeadc20c3b7d57d (patch) | |
| tree | 326de14736d5f65a5eda2c6bc71771ced121e272 /tests/vb2_kernel_tests.c | |
| parent | b2dca286baa74b71da70fb59e8a3f94df57269fe (diff) | |
| download | vboot-3aab301473ec0b95f109a245efeadc20c3b7d57d.tar.gz | |
vboot: Convert reboot-related errors to vboot2-style
Error codes are renamed as follows:
VBERROR_SHUTDOWN_REQUESTED
--> VB2_REQUEST_SHUTDOWN
VBERROR_REBOOT_REQUIRED
--> VB2_REQUEST_REBOOT
VBERROR_EC_REBOOT_TO_SWITCH_RW
--> VB2_REQUEST_REBOOT_EC_SWITCH_RW
VBERROR_EC_REBOOT_TO_RO_REQUIRED
--> VB2_REQUEST_REBOOT_EC_TO_RO
VBERROR_KEEP_LOOPING
--> VB2_REQUEST_UI_CONTINUE
Since these are not really "errors", they're renamed to VB2_REQUEST_*
instead, with larger values to separate from real errors.
The old vboot1-style errors will be removed once the errors are renamed
in coreboot and depthcharge.
BRANCH=none
BUG=b:124141368, chromium:988410
TEST=make runtests
Change-Id: Ide1328f9c0f2803534fb3f1f1ecd16ad8ea36a4e
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2143030
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb2_kernel_tests.c')
| -rw-r--r-- | tests/vb2_kernel_tests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index ddef912a..30da9ad5 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -278,14 +278,14 @@ static void normal_boot_tests(void) reset_common_data(FOR_NORMAL_BOOT); vb2_nv_set(ctx, VB2_NV_DISPLAY_REQUEST, 1); - TEST_EQ(vb2_normal_boot(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(vb2_normal_boot(ctx), VB2_REQUEST_REBOOT, "vb2_normal_boot() reboot to reset NVRAM display request"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, " display request reset"); reset_common_data(FOR_NORMAL_BOOT); vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1); - TEST_EQ(vb2_normal_boot(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(vb2_normal_boot(ctx), VB2_REQUEST_REBOOT, "vb2_normal_boot() reboot to reset NVRAM diag request"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, " diag request reset");} |