From 0eefd66d1be8e108622c9f9ab8cf264536862ecb Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Tue, 21 Apr 2020 13:49:00 +0800 Subject: vboot: move PERIPHERAL_BUSY to vboot2 namespace Move VBERROR_PERIPHERAL_BUSY to vboot2 namespace as: VB2_ERROR_EX_AUXFW_PERIPHERAL_BUSY BUG=b:124141368, chromium:988410 TEST=make clean && make runtests BRANCH=none Change-Id: Iebc7d73e3a87a8bd4d999be56ad23d6b77d9785c Signed-off-by: Joel Kitching Cq-Depend: chromium:2158865 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2158512 Reviewed-by: Joel Kitching Commit-Queue: Joel Kitching Tested-by: Joel Kitching --- firmware/2lib/include/2return_codes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index f94d0b20..45fb8b58 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -63,8 +63,6 @@ enum vb2_return_code { * vboot1-style errors * TODO: deprecate these once they have all moved over to vboot2 style */ - /* Peripheral busy. Cannot upgrade firmware at present. */ - VBERROR_PERIPHERAL_BUSY = 0x10030, /* Error writing VPD */ VBERROR_VPD_WRITE = 0x10032, @@ -734,6 +732,9 @@ enum vb2_return_code { /* vb2ex function is unimplemented (stubbed in 2lib/2stub.c) */ VB2_ERROR_EX_UNIMPLEMENTED, + /* AUXFW peripheral busy. Cannot upgrade firmware at present. */ + VB2_ERROR_EX_AUXFW_PERIPHERAL_BUSY, + /********************************************************************** * LoadKernel errors * -- cgit v1.2.1