vboot: remove unnecessary vboot_common.h includes
BUG=b:124141368 TEST=make clean && make runtests BRANCH=none Change-Id: I7daf97a88c71ff188c5812a30ca71d6c84823ae9 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1844595 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
parent
09f6670674
commit
b85ce0705d
|
@ -11,7 +11,6 @@
|
|||
#include "2nvstorage.h"
|
||||
#include "2sysincludes.h"
|
||||
#include "vboot_api.h"
|
||||
#include "vboot_common.h"
|
||||
#include "vboot_display.h"
|
||||
#include "vboot_kernel.h"
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
#include "utility.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_api.h"
|
||||
#include "vboot_common.h"
|
||||
#include "vboot_kernel.h"
|
||||
#include "vboot_struct.h"
|
||||
#include "vboot_test.h"
|
||||
|
||||
/* Global variables */
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "utility.h"
|
||||
#include "vboot_api.h"
|
||||
#include "vboot_audio.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
int audio_open_count = 0; /* Times audio has been opened */
|
||||
static int audio_use_short; /* Use short delay? */
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "vboot_common.h"
|
||||
#include "vboot_display.h"
|
||||
#include "vboot_kernel.h"
|
||||
#include "vboot_struct.h"
|
||||
|
||||
static uint32_t disp_current_screen = VB_SCREEN_BLANK;
|
||||
static uint32_t disp_current_index = 0;
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
#include "utility.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_api.h"
|
||||
#include "vboot_common.h"
|
||||
#include "vboot_kernel.h"
|
||||
#include "vboot_struct.h"
|
||||
|
||||
#define LOWEST_TPM_VERSION 0xffffffff
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "vboot_common.h"
|
||||
#include "vboot_display.h"
|
||||
#include "vboot_kernel.h"
|
||||
#include "vboot_struct.h"
|
||||
#include "vboot_ui_common.h"
|
||||
|
||||
/* Global variables */
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "vboot_common.h"
|
||||
#include "vboot_display.h"
|
||||
#include "vboot_kernel.h"
|
||||
#include "vboot_struct.h"
|
||||
#include "vboot_ui_common.h"
|
||||
#include "vboot_ui_menu_private.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "vb21_common.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vb2_struct.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Options */
|
||||
struct sign_option_s sign_option = {
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "util_misc.h"
|
||||
#include "vb1_helper.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Command line options */
|
||||
enum {
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "vb1_helper.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vb2_struct.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Global opts */
|
||||
static int opt_verbose;
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "util_misc.h"
|
||||
#include "vb1_helper.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Command line options */
|
||||
enum {
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "util_misc.h"
|
||||
#include "vb1_helper.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Command line options */
|
||||
enum {
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include "2common.h"
|
||||
#include "vboot_common.h"
|
||||
#include "host_key.h"
|
||||
|
||||
/* This program */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
#include "2rsa.h"
|
||||
#include "file_type.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
struct vb2_private_key;
|
||||
struct vb21_packed_key;
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "crossystem.h"
|
||||
#include "crossystem_vbnv.h"
|
||||
#include "host_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Base name for firmware FDT files */
|
||||
#define FDT_BASE_PATH "/proc/device-tree/firmware/chromeos"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "crossystem_arch.h"
|
||||
#include "crossystem.h"
|
||||
#include "host_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* TODO: Currently these are stub implementations providing reasonable defaults
|
||||
* wherever possible. They will need real implementation as part of of MIPS
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "crossystem_vbnv.h"
|
||||
#include "host_common.h"
|
||||
#include "utility.h"
|
||||
#include "vboot_common.h"
|
||||
#include "vboot_struct.h"
|
||||
|
||||
/* ACPI constants from Chrome OS Main Processor Firmware Spec */
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "host_key2.h"
|
||||
#include "utility.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
struct vb2_fw_preamble *vb2_create_fw_preamble(
|
||||
uint32_t firmware_version,
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "host_common.h"
|
||||
#include "host_misc.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
int packed_key_looks_ok(const struct vb2_packed_key *key, uint32_t size)
|
||||
{
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "host_key.h"
|
||||
#include "host_misc.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
enum vb2_crypto_algorithm vb2_get_crypto_algorithm(
|
||||
enum vb2_hash_algorithm hash_alg,
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "host_key.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vb2_struct.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
struct vb2_keyblock *vb2_create_keyblock(
|
||||
const struct vb2_packed_key *data_key,
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#include "host_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
char* StrCopy(char* dest, const char* src, int dest_size)
|
||||
{
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "host_key2.h"
|
||||
#include "host_signature2.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
struct vb2_signature *vb2_alloc_signature(uint32_t sig_size,
|
||||
uint32_t data_size)
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "openssl_compat.h"
|
||||
#include "util_misc.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
const char *packed_key_sha1_string(const struct vb2_packed_key *key)
|
||||
{
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "test_common.h"
|
||||
#include "tlcl.h"
|
||||
#include "tlcl_internal.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Mock data */
|
||||
static char debug_info[4096];
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
#include "test_common.h"
|
||||
#include "utility.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Test string concatenation */
|
||||
static void StrncatTest(void) {
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "host_key2.h"
|
||||
#include "test_common.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
static const uint8_t test_data[] = "This is some test data to sign.";
|
||||
static const uint32_t test_size = sizeof(test_data);
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "host_signature.h"
|
||||
#include "test_common.h"
|
||||
#include "vb2_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
static void resign_keyblock(struct vb2_keyblock *h,
|
||||
const struct vb2_private_key *key)
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "2nvstorage.h"
|
||||
#include "2sysincludes.h"
|
||||
#include "test_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
/* Single NV storage field to test */
|
||||
struct nv_field {
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "2secdata_struct.h"
|
||||
#include "2sysincludes.h"
|
||||
#include "test_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
|
||||
__attribute__((aligned(VB2_WORKBUF_ALIGN)));
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "2secdata_struct.h"
|
||||
#include "2sysincludes.h"
|
||||
#include "test_common.h"
|
||||
#include "vboot_common.h"
|
||||
|
||||
static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
|
||||
__attribute__((aligned(VB2_WORKBUF_ALIGN)));
|
||||
|
|
Loading…
Reference in New Issue