From 4114aa8375f152312e9f43260124092f031680a9 Mon Sep 17 00:00:00 2001
From: Joel Kitching <kitching@google.com>
Date: Thu, 25 Apr 2019 17:10:52 +0800
Subject: vboot: specify NEED_VB20_INTERNALS when needed

NEED_VB20_INTERNALS should always be specified when peeking
into vboot internal data structures.

BUG=b:124141368, chromium:956474
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: I5a47a28350fd5a68efeff0d06ca150c1ae145412
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32452
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/security/vboot/bootmode.c      | 2 ++
 src/security/vboot/vboot_handoff.c | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 1d6525f966..e6e53b6f33 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -13,6 +13,8 @@
  * GNU General Public License for more details.
  */
 
+#define NEED_VB20_INTERNALS  /* Peeking into vb2_shared_data */
+
 #include <assert.h>
 #include <bootmode.h>
 #include <bootstate.h>
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
index 047fcafb3d..ff938e15ce 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -13,11 +13,8 @@
  * 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
+#define NEED_VB20_INTERNALS  /* Peeking into vb2_shared_data */
+
 #include <stddef.h>
 #include <stdint.h>
 #include <vb2_api.h>
-- 
cgit v1.2.3