summaryrefslogtreecommitdiff
path: root/futility
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-10-07 23:26:57 +0800
committerCommit Bot <commit-bot@chromium.org>2019-12-10 10:36:21 +0000
commitefec8ac6a3b7539ca327b6317f4fac1714cc9401 (patch)
treee98fc3897dd9c53a02f32344256e73a8cd921c08 /futility
parent32ec1ee25c71e64fd7f6d04d4cad3d7fb251060f (diff)
downloadvboot-efec8ac6a3b7539ca327b6317f4fac1714cc9401.tar.gz
vboot: merge vb2_struct.h into 2struct.h
Also remove unused preamble structs in vboot_struct.h. BUG=b:124141368, chromium:968464 TEST=make clean && make runtests BRANCH=none Change-Id: I8b41f24b55eba91b1f952415eda1b532732848eb Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1844601 Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'futility')
-rw-r--r--futility/cmd_sign.c1
-rw-r--r--futility/cmd_vbutil_kernel.c1
-rw-r--r--futility/dump_kernel_config_lib.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c
index 1973143b..ce37e87e 100644
--- a/futility/cmd_sign.c
+++ b/futility/cmd_sign.c
@@ -30,7 +30,6 @@
#include "vb1_helper.h"
#include "vb21_common.h"
#include "vb2_common.h"
-#include "vb2_struct.h"
/* Options */
struct sign_option_s sign_option = {
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c
index 99ffcfc2..aeb6da61 100644
--- a/futility/cmd_vbutil_kernel.c
+++ b/futility/cmd_vbutil_kernel.c
@@ -27,7 +27,6 @@
#include "kernel_blob.h"
#include "vb1_helper.h"
#include "vb2_common.h"
-#include "vb2_struct.h"
#include "vboot_common.h"
/* Global opts */
diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
index 2315a0ab..5f7aa20e 100644
--- a/futility/dump_kernel_config_lib.c
+++ b/futility/dump_kernel_config_lib.c
@@ -17,7 +17,6 @@
#include "futility.h"
#include "host_common.h"
#include "kernel_blob.h"
-#include "vb2_struct.h"
#include "vboot_api.h"
#include "vboot_host.h"