From a6531a335c9fed0776f033ee69f7eb4fc325c944 Mon Sep 17 00:00:00 2001
From: Joel Kitching <kitching@google.com>
Date: Thu, 20 Feb 2020 17:50:25 +0800
Subject: vboot: remove rogue vboot_struct.h include

As part of vboot1 deprecation, remove an unused vboot_struct.h
include.  coreboot is now free of vboot1 data structure use.
One vboot_api.h include remains as part of security/vboot/ec_sync.c.

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

Change-Id: I042d692aa252f8f859d4005455eb6a2eabc24a87
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39024
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/security/vboot/ec_sync.c          | 2 +-
 src/vendorcode/google/chromeos/gnvs.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c
index f4f9c23976..e7b64b2398 100644
--- a/src/security/vboot/ec_sync.c
+++ b/src/security/vboot/ec_sync.c
@@ -23,7 +23,7 @@
 #include <timer.h>
 #include <timestamp.h>
 #include <vb2_api.h>
-#include <vboot_api.h>
+#include <vboot_api.h>  /* for VbExDisplayScreen() and VbScreenData */
 
 #define _EC_FILENAME(select, suffix) \
 	(select == VB_SELECT_FIRMWARE_READONLY ? "ecro" suffix : "ecrw" suffix)
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index 81154550ec..04680c0974 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -22,7 +22,6 @@
 #include <fmap.h>
 #include <security/vboot/vbnv.h>
 #include <security/vboot/vboot_common.h>
-#include <vboot_struct.h>
 
 #include "chromeos.h"
 #include "gnvs.h"
-- 
cgit v1.2.3