diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-12-03 17:35:53 -0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-04-10 16:49:15 +0200 |
| commit | 144c2283a4c03ba8a0c602951371398437d106e6 (patch) | |
| tree | 02a912589d449ab3db277f816ad2bf7262620134 /src/vendorcode/google | |
| parent | d0db3a90add3333ccdd70922967ff6f2d9315451 (diff) | |
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 <rspangler@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/233051
Original-Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit df55e0365de8da85844f7e7b057ca5d2a9694a8b)
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: I999af95ccf8c326f2fd2de0f7da50515e02ad904
Reviewed-on: http://review.coreboot.org/9446
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/vendorcode/google')
4 files changed, 7 insertions, 7 deletions
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 <cbfs.h> #include <cbfs_core.h> #include <console/console.h> #include <spi_flash.h> #include <string.h> +#include <vb2_api.h> #include <vboot_nvstorage.h> #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 <antirollback.h> +#include <stdlib.h> +#include <string.h> #include <tpm_lite/tlcl.h> #include <tpm_lite/tss_constants.h> +#include <vb2_api.h> #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 <arch/stages.h> #include <assert.h> #include <stdint.h> @@ -30,6 +28,8 @@ #include <console/vtxprintf.h> #include <stdlib.h> #include <timestamp.h> +#define NEED_VB20_INTERNALS /* TODO: remove me! */ +#include <vb2_api.h> #include <vboot_struct.h> #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 <antirollback.h> #include <console/console.h> #include <console/vtxprintf.h> #include <string.h> +#include <vb2_api.h> #include "../chromeos.h" #include "misc.h" |