diff options
-rw-r--r-- | src/include/antirollback.h | 4 | ||||
-rw-r--r-- | src/lib/tlcl.c | 4 | ||||
-rw-r--r-- | src/vendorcode/google/chromeos/vbnv_flash.c | 2 | ||||
-rw-r--r-- | src/vendorcode/google/chromeos/vboot2/antirollback.c | 5 | ||||
-rw-r--r-- | src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 4 | ||||
-rw-r--r-- | 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 06ad9f786..942793a62 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 3cfc40841..c37b51a53 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 665c18427..3d4581ff8 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 bb547b51b..f420d1611 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 2dadffaf1..33ff79a4c 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 572e16182..42b02564e 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" |