GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commonlib/include: remove NEED_VB20_INTERNALS 

vboot_handoff.c is the only place that needs the vb2 internals.
Provide it in the one place it is actually required instead of
pulling in the headers unnecessarily in common code. There is,
however, still a need to get the vb2 hashing types for a function
declaration.

Change-Id: I038fda68b1cd05fa2e66135158e5e2d18567563a
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/17475
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2016-11-18 09:05:18 -06:00
parent e35e695377
commit 1f0ce3a80e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commonlib/include/commonlib/cbfs.h
View File

@ -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. */

13
src/vboot/vboot_handoff.c
View File

@ -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>