diff options
| author | Joel Kitching <kitching@google.com> | 2020-04-29 18:43:33 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-05 05:22:41 +0000 |
| commit | e74af70deba98bb287707f0ce5f80025aa91e9dc (patch) | |
| tree | 6376ecd597e20ad4c426ca3188af1aba60c8b86e | |
| parent | b4dd58141ba7d003029bec0ad3391327f32a8a39 (diff) | |
| download | vboot-e74af70deba98bb287707f0ce5f80025aa91e9dc.tar.gz | |
vboot: fix up EC/auxfw sync includes
BUG=b:124141368, chromium:1016688
TEST=make clean && make runtests
BRANCH=none
Change-Id: Iabf62e4df5e554da28b191878b76d926299d73b9
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2171544
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/2auxfw_sync.c | 4 | ||||
| -rw-r--r-- | firmware/2lib/2ec_sync.c | 4 | ||||
| -rw-r--r-- | firmware/lib/include/vboot_display.h | 10 |
3 files changed, 6 insertions, 12 deletions
diff --git a/firmware/2lib/2auxfw_sync.c b/firmware/2lib/2auxfw_sync.c index c39504d1..0be4b4da 100644 --- a/firmware/2lib/2auxfw_sync.c +++ b/firmware/2lib/2auxfw_sync.c @@ -8,10 +8,6 @@ #include "2api.h" #include "2common.h" #include "2misc.h" -#include "2nvstorage.h" -#include "2sysincludes.h" -#include "vboot_api.h" -#include "vboot_display.h" /** * Determine if we are allowed to update auxfw diff --git a/firmware/2lib/2ec_sync.c b/firmware/2lib/2ec_sync.c index 85f5b2e4..71067906 100644 --- a/firmware/2lib/2ec_sync.c +++ b/firmware/2lib/2ec_sync.c @@ -11,10 +11,6 @@ #include "2nvstorage.h" #include "2secdata.h" #include "2sysincludes.h" -#include "vboot_api.h" -#include "vboot_display.h" -#include "vboot_kernel.h" -#include "vboot_test.h" #define SYNC_FLAG(select) \ ((select) == VB_SELECT_FIRMWARE_READONLY ? \ diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h index c5af967c..e4d11872 100644 --- a/firmware/lib/include/vboot_display.h +++ b/firmware/lib/include/vboot_display.h @@ -8,13 +8,15 @@ #ifndef VBOOT_REFERENCE_VBOOT_DISPLAY_H_ #define VBOOT_REFERENCE_VBOOT_DISPLAY_H_ +#include "vboot_api.h" + vb2_error_t VbDisplayScreen(struct vb2_context *ctx, uint32_t screen, int force, - const VbScreenData *data); + const VbScreenData *data); vb2_error_t VbDisplayMenu(struct vb2_context *ctx, - uint32_t screen, int force, uint32_t selected_index, - uint32_t disabled_idx_mask); + uint32_t screen, int force, uint32_t selected_index, + uint32_t disabled_idx_mask); vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx); vb2_error_t VbCheckDisplayKey(struct vb2_context *ctx, uint32_t key, - const VbScreenData *data); + const VbScreenData *data); #endif /* VBOOT_REFERENCE_VBOOT_DISPLAY_H_ */ |