vboot_ref: merge struct firmware_image;
BUG=b:207808292
BRANCH=none
TEST=none
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I49bd29dcfe12ad9845213d07bc6bee71980a8cd1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3461092
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/futility/updater_utils.h b/futility/updater_utils.h
index 8ac0683..e2c8b96 100644
--- a/futility/updater_utils.h
+++ b/futility/updater_utils.h
@@ -54,15 +54,8 @@
*/
void remove_all_temp_files(struct tempfile *head);
-/* Utilities for firmware images and (FMAP) sections */
-struct firmware_image {
- const char *programmer;
- uint32_t size;
- uint8_t *data;
- char *file_name;
- char *ro_version, *rw_version_a, *rw_version_b;
- FmapHeader *fmap_header;
-};
+/* Include definition of 'struct firmware_image;' */
+#include "flashrom.h"
enum {
IMAGE_LOAD_SUCCESS = 0,
diff --git a/host/lib/include/flashrom.h b/host/lib/include/flashrom.h
index 4a16b19..0a4f885 100644
--- a/host/lib/include/flashrom.h
+++ b/host/lib/include/flashrom.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include "2return_codes.h"
+#include "fmap.h"
#define FLASHROM_PROGRAMMER_INTERNAL_AP "host"
#define FLASHROM_PROGRAMMER_INTERNAL_EC "ec"
@@ -23,14 +24,9 @@
const char *programmer;
uint32_t size; /* buffer size. */
uint8_t *data; /* data allocated buffer to read/write with. */
- /*
- * TODO(quasisec b/207808292): Merge with other instance in vboot_ref
- * such that the code becomes common.
- *
char *file_name;
char *ro_version, *rw_version_a, *rw_version_b;
FmapHeader *fmap_header;
- */
};
/**
