From 6e537e8cefffafabddb323b58fa1fb2a605ea195 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 10 Feb 2022 10:57:56 +1100 Subject: vboot_ref: merge struct firmware_image; BUG=b:207808292 BRANCH=none TEST=none Signed-off-by: Edward O'Callaghan Change-Id: I49bd29dcfe12ad9845213d07bc6bee71980a8cd1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3461092 Tested-by: Edward O'Callaghan Auto-Submit: Edward O'Callaghan Reviewed-by: Nikolai Artemiev Reviewed-by: Sam McNally Commit-Queue: Edward O'Callaghan --- futility/updater_utils.h | 11 ++--------- host/lib/include/flashrom.h | 6 +----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/futility/updater_utils.h b/futility/updater_utils.h index 8ac06831..e2c8b961 100644 --- a/futility/updater_utils.h +++ b/futility/updater_utils.h @@ -54,15 +54,8 @@ const char *create_temp_file(struct tempfile *head); */ 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 4a16b194..0a4f885b 100644 --- a/host/lib/include/flashrom.h +++ b/host/lib/include/flashrom.h @@ -8,6 +8,7 @@ #include #include "2return_codes.h" +#include "fmap.h" #define FLASHROM_PROGRAMMER_INTERNAL_AP "host" #define FLASHROM_PROGRAMMER_INTERNAL_EC "ec" @@ -23,14 +24,9 @@ struct firmware_image { 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; - */ }; /** -- cgit v1.2.1