diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-28 13:32:22 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-06 03:49:12 +0000 |
| commit | 123bd5f6dbc2f039c28ac826993454489dc6767d (patch) | |
| tree | c06d02908b048e53a89318334178a94eb03fe59b /firmware/include | |
| parent | ed8390ec50b2decdf18a3416d07d37222cb0130d (diff) | |
| download | vboot-123bd5f6dbc2f039c28ac826993454489dc6767d.tar.gz | |
vboot: remove VbExEcEnteringMode and friends
After informing EC of the mode chosen by vboot, it is stored
in a global and never accessed again. Remove this function,
its calls, and its tests.
Also note some significant issues which existed:
(1) Using accessor VbGetMode for tests, rather than just
overriding VbExEcEnteringMode when needed.
(2) The tests checking the value sent to VbExEcEnteringMode
(vboot_api_kernel2_tests and vboot_detach_menu_tests)
actually call the function themselves.
BUG=b:124141368, chromium:1014379
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib8e510a1e1c663bb3f8238a9ad15e3e64d7350b0
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1864533
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1830239
Reviewed-by: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/vboot_api.h | 7 | ||||
| -rw-r--r-- | firmware/include/vboot_test.h | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 9f1b9551..d07852a5 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -710,13 +710,6 @@ vb2_error_t VbExEcUpdateImage(int devidx, enum VbSelectFirmware_t select, vb2_error_t VbExEcProtect(int devidx, enum VbSelectFirmware_t select); /** - * Info the EC of the boot mode selected by the AP. - * mode: Normal, Developer, or Recovery - */ -enum VbEcBootMode_t {VB_EC_NORMAL, VB_EC_DEVELOPER, VB_EC_RECOVERY }; -vb2_error_t VbExEcEnteringMode(int devidx, enum VbEcBootMode_t mode); - -/** * Perform EC post-verification / updating / jumping actions. * * This routine is called to perform certain actions that must wait until diff --git a/firmware/include/vboot_test.h b/firmware/include/vboot_test.h index a825bd9c..bdd1f378 100644 --- a/firmware/include/vboot_test.h +++ b/firmware/include/vboot_test.h @@ -8,7 +8,9 @@ #ifndef VBOOT_REFERENCE_TEST_API_H_ #define VBOOT_REFERENCE_TEST_API_H_ -/* +/**************************************************************************** + * 2rsa.c + * * Internal functions from 2rsa.c that have error conditions we can't trigger * from the public APIs. These include checks for bad algorithms where the * next call level up already checks for bad algorithms, etc. @@ -21,8 +23,8 @@ int vb2_mont_ge(const struct vb2_public_key *key, uint32_t *a); vb2_error_t vb2_check_padding(const uint8_t *sig, const struct vb2_public_key *key); -enum VbEcBootMode_t; -enum VbEcBootMode_t VbGetMode(void); +/**************************************************************************** + * vboot_api_kernel.c */ struct RollbackSpaceFwmp; struct RollbackSpaceFwmp *VbApiKernelGetFwmp(void); |