From 144c2283a4c03ba8a0c602951371398437d106e6 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Wed, 3 Dec 2014 17:35:53 -0800 Subject: vboot: Include vb2_api.h, instead of lower-level vboot2 header files This will allow vboot2 to continue refactoring without breaking coreboot, since there's now only a single file which needs to stay in sync. BUG=chromium:423882 BRANCH=none TEST=emerge-veyron_pinky coreboot CQ-DEPEND=CL:233050 Original-Change-Id: I74cae5f0badfb2d795eb5420354b9e6d0b4710f7 Original-Signed-off-by: Randall Spangler Original-Reviewed-on: https://chromium-review.googlesource.com/233051 Original-Reviewed-by: Daisuke Nojiri (cherry picked from commit df55e0365de8da85844f7e7b057ca5d2a9694a8b) Signed-off-by: Aaron Durbin Change-Id: I999af95ccf8c326f2fd2de0f7da50515e02ad904 Reviewed-on: http://review.coreboot.org/9446 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/include/antirollback.h | 4 ++-- src/lib/tlcl.c | 4 ++-- src/vendorcode/google/chromeos/vbnv_flash.c | 2 +- src/vendorcode/google/chromeos/vboot2/antirollback.c | 5 +++-- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 4 ++-- src/vendorcode/google/chromeos/vboot2/verstage.c | 3 +-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/include/antirollback.h b/src/include/antirollback.h index 06ad9f786b..942793a62b 100644 --- a/src/include/antirollback.h +++ b/src/include/antirollback.h @@ -9,10 +9,10 @@ #ifndef ANTIROLLBACK_H_ #define ANTIROLLBACK_H_ -#include "2sysincludes.h" -#include <2api.h> #include "tpm_lite/tss_constants.h" +struct vb2_context; + /* TPM NVRAM location indices. */ #define FIRMWARE_NV_INDEX 0x1007 #define KERNEL_NV_INDEX 0x1008 diff --git a/src/lib/tlcl.c b/src/lib/tlcl.c index 3cfc40841a..c37b51a532 100644 --- a/src/lib/tlcl.c +++ b/src/lib/tlcl.c @@ -14,11 +14,11 @@ * time. */ -#include <2api.h> -#include <2sysincludes.h> #include +#include #include #include +#include #include "tlcl_internal.h" #include "tlcl_structures.h" diff --git a/src/vendorcode/google/chromeos/vbnv_flash.c b/src/vendorcode/google/chromeos/vbnv_flash.c index 665c184273..3d4581ff82 100644 --- a/src/vendorcode/google/chromeos/vbnv_flash.c +++ b/src/vendorcode/google/chromeos/vbnv_flash.c @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <2api.h> #include #include #include #include #include +#include #include #include "chromeos.h" diff --git a/src/vendorcode/google/chromeos/vboot2/antirollback.c b/src/vendorcode/google/chromeos/vboot2/antirollback.c index bb547b51bc..f420d16114 100644 --- a/src/vendorcode/google/chromeos/vboot2/antirollback.c +++ b/src/vendorcode/google/chromeos/vboot2/antirollback.c @@ -6,11 +6,12 @@ * stored in the TPM NVRAM. */ -#include <2api.h> -#include <2sysincludes.h> #include +#include +#include #include #include +#include #ifndef offsetof #define offsetof(A,B) __builtin_offsetof(A,B) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index 2dadffaf1c..33ff79a4c2 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <2recovery_reasons.h> -#include <2struct.h> #include #include #include @@ -30,6 +28,8 @@ #include #include #include +#define NEED_VB20_INTERNALS /* TODO: remove me! */ +#include #include #include "../chromeos.h" #include "../fmap.h" diff --git a/src/vendorcode/google/chromeos/vboot2/verstage.c b/src/vendorcode/google/chromeos/vboot2/verstage.c index 572e161825..42b02564eb 100644 --- a/src/vendorcode/google/chromeos/vboot2/verstage.c +++ b/src/vendorcode/google/chromeos/vboot2/verstage.c @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <2api.h> -#include <2struct.h> #include #include #include #include +#include #include "../chromeos.h" #include "misc.h" -- cgit v1.2.3