diff options
| author | Joel Kitching <kitching@google.com> | 2020-02-14 13:18:06 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-02-14 07:21:38 +0000 |
| commit | 814c8657cb5cc207ec0f04fc2af133ec90e6e5f6 (patch) | |
| tree | 17ce2c7ffca768b8b9c9b4c0f56ed02b4f8b3b4f | |
| parent | 820ad004bbebe406e845ec9cc5d186544601c3d4 (diff) | |
| download | coreboot-814c8657cb5cc207ec0f04fc2af133ec90e6e5f6.tar.xz | |
vboot: fix up some includes
These header files need to make use of vb2_shared_data.
Remove the last vestiges of vboot1 data structures in coreboot.
BUG=b:124141368, chromium:1038260
TEST=Build locally with CL:2054269
TEST=make clean && make test-abuild
BRANCH=none
Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38884
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/security/vboot/ec_sync.c | 1 | ||||
| -rw-r--r-- | src/security/vboot/misc.h | 4 | ||||
| -rw-r--r-- | src/security/vboot/vboot_common.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c index ecceff50f9..f4f9c23976 100644 --- a/src/security/vboot/ec_sync.c +++ b/src/security/vboot/ec_sync.c @@ -23,6 +23,7 @@ #include <timer.h> #include <timestamp.h> #include <vb2_api.h> +#include <vboot_api.h> #define _EC_FILENAME(select, suffix) \ (select == VB_SELECT_FIRMWARE_READONLY ? "ecro" suffix : "ecrw" suffix) diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index 2d5b0845d1..324af5ca11 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -18,9 +18,7 @@ #include <assert.h> #include <security/vboot/vboot_common.h> - -struct vb2_context; -struct vb2_shared_data; +#include <vb2_api.h> /* * Source: security/vboot/common.c diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 976c26a70b..57f3475adb 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -17,8 +17,7 @@ #include <commonlib/region.h> #include <stdint.h> -#include <vboot_api.h> -#include <vboot_struct.h> +#include <vb2_api.h> /* * Function to check if there is a request to enter recovery mode. Returns |