From beaefe0f96758297d013bd48b598225410b44e34 Mon Sep 17 00:00:00 2001 From: dhendrix Date: Sun, 3 Sep 2017 18:06:53 -0700 Subject: Move get_layout() from flashrom.c to layout.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic67cf53abddc0aa905674acbcde717d9aed2f66e Signed-off-by: David Hendricks Reviewed-on: https://review.coreboot.org/21367 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- flashrom.c | 8 -------- layout.c | 8 ++++++++ layout.h | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flashrom.c b/flashrom.c index 4f17382d..4fe18432 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1529,14 +1529,6 @@ static int check_block_eraser(const struct flashctx *flash, int k, int log) return 0; } -static const struct flashrom_layout *get_layout(const struct flashctx *const flashctx) -{ - if (flashctx->layout && flashctx->layout->num_entries) - return flashctx->layout; - else - return &flashctx->fallback_layout.base; -} - /** * @brief Reads the included layout regions into a buffer. * diff --git a/layout.c b/layout.c index 9bf0b038..7ce7c579 100644 --- a/layout.c +++ b/layout.c @@ -40,6 +40,14 @@ struct flashrom_layout *get_global_layout(void) return &layout; } +const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx) +{ + if (flashctx->layout && flashctx->layout->num_entries) + return flashctx->layout; + else + return &flashctx->fallback_layout.base; +} + #ifndef __LIBPAYLOAD__ int read_romlayout(const char *name) { diff --git a/layout.h b/layout.h index f32dc829..fd1049d8 100644 --- a/layout.h +++ b/layout.h @@ -58,6 +58,8 @@ struct single_layout { }; struct flashrom_layout *get_global_layout(void); +struct flashrom_flashctx; +const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx); int process_include_args(struct flashrom_layout *); -- cgit v1.2.3