diff options
| -rw-r--r-- | src/commonlib/include/commonlib/cbfs.h | 2 | ||||
| -rw-r--r-- | src/vboot/vboot_handoff.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/commonlib/include/commonlib/cbfs.h b/src/commonlib/include/commonlib/cbfs.h index 5e511a7aea..163bef270a 100644 --- a/src/commonlib/include/commonlib/cbfs.h +++ b/src/commonlib/include/commonlib/cbfs.h @@ -18,8 +18,6 @@ #include <commonlib/cbfs_serialized.h> #include <commonlib/region.h> -/* TODO: remove me! This is for vboot_handoff.c's benefit. */ -#define NEED_VB20_INTERNALS #include <vb2_api.h> /* Object representing cbfs files. */ diff --git a/src/vboot/vboot_handoff.c b/src/vboot/vboot_handoff.c index b732b3aaa8..2533a1d415 100644 --- a/src/vboot/vboot_handoff.c +++ b/src/vboot/vboot_handoff.c @@ -13,11 +13,18 @@ * GNU General Public License for more details. */ +/* This needs to be pulled in first so that the handoff code below and + * peek into the vb2 data structures. Additionally, vboot doesn't currently + * include what it uses in its own headers. Provide the types it's after. + * TODO: fix this necessity. */ +#define NEED_VB20_INTERNALS +#include <stddef.h> +#include <stdint.h> +#include <vb2_api.h> + #include <arch/stages.h> #include <assert.h> #include <bootmode.h> -#include <stdint.h> -#include <stddef.h> #include <string.h> #include <cbfs.h> #include <cbmem.h> @@ -26,8 +33,6 @@ #include <fmap.h> #include <stdlib.h> #include <timestamp.h> -#define NEED_VB20_INTERNALS /* TODO: remove me! */ -#include <vb2_api.h> #include <vboot_struct.h> #include <vboot/vbnv.h> #include <vboot/misc.h> |