Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9446
-gerrit
commit 21c2e9110cdc3fd5d4731d46493b5d165383409c Author: Randall Spangler rspangler@chromium.org Date: Wed Dec 3 17:35:53 2014 -0800
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 --- 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(-)
diff --git a/src/include/antirollback.h b/src/include/antirollback.h index 06ad9f7..942793a 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 3cfc408..c37b51a 100644 --- a/src/lib/tlcl.c +++ b/src/lib/tlcl.c @@ -14,11 +14,11 @@ * time. */
-#include <2api.h> -#include <2sysincludes.h> #include <assert.h> +#include <string.h> #include <tpm_lite/tlcl.h> #include <tpm.h> +#include <vb2_api.h> #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 665c184..3d4581f 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 bb547b5..f420d16 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 2dadffa..33ff79a 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 572e161..42b0256 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"