From 3aab301473ec0b95f109a245efeadc20c3b7d57d Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Fri, 10 Apr 2020 08:54:05 +0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2143030 Reviewed-by: Julius Werner Reviewed-by: Joel Kitching --- tests/vb2_kernel_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/vb2_kernel_tests.c') 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");} -- cgit v1.2.1